From 7d44d7a2a9ee8f55e911d678d78ff25f047cab4d Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 24 Jun 2024 12:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java | 25 +++++++++++++++++++------
1 files changed, 19 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..e4a0ecf 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,19 @@
/**
* 修改时间
*/
- private LocalDateTime updateTime;
+ private String updateTime;
/**
* 水库名
*/
private String skName;
+
+
+ @TableField(exist = false)
+ private List<SgTypeVO> sgGxDOS;
+
+ private Integer status;
+
+ @TableField(exist = false)
+ private String projectProgress;
}
--
Gitblit v1.9.3