From ff6f8f0b00136dfab053d78826e876e15bf9e9dd Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 26 May 2023 20:46:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java
index fc60d14..8e0045d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java
@@ -46,12 +46,12 @@
baseMapper.updateAttResFlseLimByGuid(attResFlseLimQ,"前汛期");
}
if (null != editResInfoVO.getXqswObjZ()) {
- AttResFlseLim attResFlseLimZ = editResInfoVO.getXqswObjQ();
+ AttResFlseLim attResFlseLimZ = editResInfoVO.getXqswObjZ();
attResFlseLimZ.setResGuid(editResInfoVO.getResGuid());
baseMapper.updateAttResFlseLimByGuid(attResFlseLimZ,"中汛期");
}
if (null != editResInfoVO.getXqswObjH()) {
- AttResFlseLim attResFlseLimH = editResInfoVO.getXqswObjQ();
+ AttResFlseLim attResFlseLimH = editResInfoVO.getXqswObjH();
attResFlseLimH.setResGuid(editResInfoVO.getResGuid());
baseMapper.updateAttResFlseLimByGuid(attResFlseLimH,"后汛期");
}
--
Gitblit v1.9.3