From 8a8a13eb80498e9b905b47b8dc4d52cd8fdb8497 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 24 十月 2023 16:36:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolpointRecord.java | 20 +++++++++++++++++++-
1 files changed, 19 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 427109a..e0515d6 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;
/** 缁忓害 */
@@ -55,9 +56,26 @@
private String recordImg;
+ private Integer pointsNum;
+
+ @TableField(exist = false)
+ private String planUserName;
+
@TableField(exist = false)
private List<String> img;
+ /** 鍒犻櫎鏍囪 */
+ @Excel(name = "鍒犻櫎鏍囪")
+ private Integer del;
+
+ public Integer getDel() {
+ return del;
+ }
+
+ public void setDel(Integer del) {
+ this.del = del;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.9.3