From ab5c1c6cbcdeb98d84bdde3c111fe871466d3a5c Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Wed, 15 May 2024 10:38:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java
index 70a8a07..dc066aa 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java
@@ -104,9 +104,9 @@
 	@ApiOperation(value = "白蚁普查-添加或者修改", notes = "白蚁普查-添加或者修改")
 	@PostMapping(value = "/submit")
 	public R submit(@RequestBody TbResGeneralInvestigation tbResGeneralInvestigation) {
-		if (tbResGeneralInvestigation.getGuid() == null) {
-			tbResGeneralInvestigation.setCreateTime(new Date());
-		}
+//		if (tbResGeneralInvestigation.getGuid() == null) {
+		tbResGeneralInvestigation.setCreateTime(new Date());
+//		}
 		return tbResGeneralInvestigationService.saveOrUpdateBy(tbResGeneralInvestigation);
 	}
 

--
Gitblit v1.9.3