From f20611265f7d34fd4fbcdfdaff6cb9cccd0b25fc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 21 Jun 2024 11:53:21 +0800
Subject: [PATCH] 湖北水库:施工:项目查询过滤无效修复、根据角色查询用户

---
 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java
index 25d5ac6..851b67f 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java
@@ -1,11 +1,12 @@
 package cn.gistack.sm.sg.DO;
 
+import cn.gistack.sm.sg.VO.SgTypeVO;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -18,6 +19,9 @@
 @Getter
 @Setter
 @TableName("SG_PROJECT_INFO")
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class SgProjectInfoDO implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -72,7 +76,7 @@
     /**
      * 注册到期时间
      */
-    private LocalDateTime expTime;
+    private String expTime;
 
     /**
      * 总承包
@@ -147,7 +151,7 @@
     /**
      * 创建时间
      */
-    private LocalDateTime createTime;
+    private String createTime;
 
     /**
      * 修改人
@@ -157,10 +161,16 @@
     /**
      * 修改时间
      */
-    private LocalDateTime updateTime;
+    private String updateTime;
 
     /**
      * 水库名
      */
     private String skName;
+
+
+	@TableField(exist = false)
+	private List<SgTypeVO> sgGxDOS;
+
+	private Integer status;
 }

--
Gitblit v1.9.3