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 |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 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 7d13b9f..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
@@ -16,7 +16,7 @@
  * @date 2023-08-02
  */
 @Data
-public class ArdAppPatrolpointRecord extends BaseEntity
+public class ArdAppPatrolpointRecord
 {
     private static final long serialVersionUID = 1L;
 
@@ -45,12 +45,21 @@
 
     private String appPatrolpointsName;
 
+    private String planId;
+
     private String planName;
 
     private String userName;
 
     private String remark;
 
+    private String recordImg;
+
+    private Integer pointsNum;
+
+    @TableField(exist = false)
+    private String planUserName;
+
     @TableField(exist = false)
     private List<String> img;
 

--
Gitblit v1.9.3