From c0d555bcd9ff0e8fa35e5a8636bc4c05743dc1e9 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 14 Jun 2024 11:36:32 +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 | 7 +++----
1 files changed, 3 insertions(+), 4 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..5ff2230 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
@@ -5,7 +5,6 @@
import lombok.Setter;
import java.io.Serializable;
-import java.time.LocalDateTime;
/**
* <p>
@@ -72,7 +71,7 @@
/**
* 注册到期时间
*/
- private LocalDateTime expTime;
+ private String expTime;
/**
* 总承包
@@ -147,7 +146,7 @@
/**
* 创建时间
*/
- private LocalDateTime createTime;
+ private String createTime;
/**
* 修改人
@@ -157,7 +156,7 @@
/**
* 修改时间
*/
- private LocalDateTime updateTime;
+ private String updateTime;
/**
* 水库名
--
Gitblit v1.9.3