From c8aaafaaf4b6ff674149db115a97e40ead5927bf Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 08 七月 2024 16:57:00 +0800
Subject: [PATCH] 车辆挂接电磁锁bug修改提交
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java
index a1598f1..3b16aae 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java
@@ -10,16 +10,17 @@
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
+import java.util.Date;
import java.util.List;
/**
* app宸℃璁″垝瀵硅薄 ard_app_patrolplan
- *
+ *
* @author ard
* @date 2023-08-02
*/
@Data
-public class ArdAppPatrolplan extends BaseEntity
+public class ArdAppPatrolplan
{
private static final long serialVersionUID = 1L;
@@ -64,17 +65,29 @@
// @JsonInclude(JsonInclude.Include.NON_DEFAULT )
private String pUser;
- /**
- * 宸℃鐐归泦鍚�
- */
- @TableField(exist = false)
- private List<ArdAlarmpointsWell> wellList;
+ private String createTime;
- /**
- * 宸℃浜洪泦鍚�
- */
@TableField(exist = false)
- private List<SysUser> userList;
+ @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+ private Integer pageNum;
+
+ @TableField(exist = false)
+ @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+ private Integer pageSize;
+
+ private String delName;
+
+ private String delTime;
+
+ private String son;
+
+ @TableField(exist = false)
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
+ private String createTimeBegin;
+
+ @TableField(exist = false)
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
+ private String createTimeEnd;
@Override
public String toString() {
--
Gitblit v1.9.3