From f97d74f9f851ef70048fab599d7bc54d7932afc7 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 23 八月 2023 17:29:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolpointRecord.java | 10 +++++++++-
1 files changed, 9 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 3d3a2db..fe3164b 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,11 +16,12 @@
* @date 2023-08-02
*/
@Data
-public class ArdAppPatrolpointRecord extends BaseEntity
+public class ArdAppPatrolpointRecord
{
private static final long serialVersionUID = 1L;
/** 涓婚敭 */
+ @TableField("id")
private String id;
/** 缁忓害 */
@@ -53,6 +54,13 @@
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