From fc45913412a310d2855dcd80dfc560acf965559d Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 18 八月 2023 15:41:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolpointRecord.java |   68 +++++++++------------------------
 1 files changed, 19 insertions(+), 49 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolpointRecord.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolpointRecord.java
index 6cdce2d..6b99113 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolpointRecord.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolpointRecord.java
@@ -1,9 +1,13 @@
 package com.ruoyi.app.patrolplan.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.List;
 
 /**
  * app宸℃璁″垝璁板綍瀵硅薄 ard_app_patrolpoint_record
@@ -11,7 +15,8 @@
  * @author ard
  * @date 2023-08-02
  */
-public class ArdAppPatrolpointRecord extends BaseEntity
+@Data
+public class ArdAppPatrolpointRecord
 {
     private static final long serialVersionUID = 1L;
 
@@ -38,60 +43,25 @@
     @Excel(name = "宸℃鐐逛富閿�")
     private String appPatrolpointsId;
 
-    public void setId(String id) 
-    {
-        this.id = id;
-    }
+    private String appPatrolpointsName;
 
-    public String getId() 
-    {
-        return id;
-    }
-    public void setLongitude(String longitude) 
-    {
-        this.longitude = longitude;
-    }
+    private String planId;
 
-    public String getLongitude() 
-    {
-        return longitude;
-    }
-    public void setLatitude(String latitude) 
-    {
-        this.latitude = latitude;
-    }
+    private String planName;
 
-    public String getLatitude() 
-    {
-        return latitude;
-    }
-    public void setUserId(String userId) 
-    {
-        this.userId = userId;
-    }
+    private String userName;
 
-    public String getUserId() 
-    {
-        return userId;
-    }
-    public void setRecordTime(String recordTime) 
-    {
-        this.recordTime = recordTime;
-    }
+    private String remark;
 
-    public String getRecordTime() 
-    {
-        return recordTime;
-    }
-    public void setAppPatrolpointsId(String appPatrolpointsId) 
-    {
-        this.appPatrolpointsId = appPatrolpointsId;
-    }
+    private String recordImg;
 
-    public String getAppPatrolpointsId() 
-    {
-        return appPatrolpointsId;
-    }
+    private Integer pointsNum;
+
+    @TableField(exist = false)
+    private String planUserName;
+
+    @TableField(exist = false)
+    private List<String> img;
 
     @Override
     public String toString() {

--
Gitblit v1.9.3