From 61c0c3ccae4c23a90c405d7ac1cb49f7d5ee0479 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 12 九月 2023 09:48:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolpointRecord.java | 12 +++++++++++-
1 files changed, 11 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..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;
/** 缁忓害 */
@@ -45,12 +46,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