From 44f2a0a32c096bdb05d4cc0ac162cdc1eb14c3ed Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 10 八月 2023 13:14:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 8f88fa5..8198d5a 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
@@ -2,11 +2,16 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
+import com.ruoyi.common.core.domain.entity.SysUser;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
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
@@ -15,7 +20,7 @@
* @date 2023-08-02
*/
@Data
-public class ArdAppPatrolplan extends BaseEntity
+public class ArdAppPatrolplan
{
private static final long serialVersionUID = 1L;
@@ -47,17 +52,29 @@
private String patroEndTime;
/**
- * 宸℃鐐�
+ * 宸℃鐐规煡璇㈡潯浠�
*/
@TableField(exist = false,select = false)
+// @JsonInclude(JsonInclude.Include.NON_DEFAULT )
private String wellId;
/**
- * 宸℃浜哄憳
+ * 宸℃浜哄憳鏌ヨ鏉′欢
*/
@TableField(exist = false,select = false)
+// @JsonInclude(JsonInclude.Include.NON_DEFAULT )
private String pUser;
+ private String createTime;
+
+ @TableField(exist = false)
+ @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+ private Integer pageNum;
+
+ @TableField(exist = false)
+ @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+ private Integer pageSize;
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.9.3