From 76d9d4af124631ffe68c5f8dfd2c6d54c61fcefa Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 23 May 2023 19:45:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResFlseLimController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResFlseLimController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResFlseLimController.java
index ca99cd4..c7c158b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResFlseLimController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResFlseLimController.java
@@ -3,6 +3,7 @@
import cn.gistack.sm.sjztmd.entity.AttResFlseLim;
import cn.gistack.sm.sjztmd.entity.AttResStagChar;
import cn.gistack.sm.sjztmd.service.IAttResFlseLimService;
+import cn.gistack.sm.sjztmd.vo.EditResInfoVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -33,15 +34,15 @@
/**
* 编辑
*
- * @param attResFlseLim
+ * @param editResInfoVO 修改实体类对象
* @return
*/
- @ApiOperation(value = "水库特征水位-编辑", notes = "水库特征水位-编辑")
+ @ApiOperation(value = "水库特征水位、汛期限制水位-编辑", notes = "水库特征水位、汛期限制水位-编辑")
@PostMapping(value = "/edit")
- public R edit(@RequestBody AttResFlseLim attResFlseLim) {
- if (StringUtil.isBlank(attResFlseLim.getGuid())) {
+ public R edit(@RequestBody EditResInfoVO editResInfoVO) {
+ if (StringUtil.isBlank(editResInfoVO.getResGuid())) {
return R.fail("参数不正确");
}
- return R.data(attResFlseLimService.updateAttResFlseLimByGuid(attResFlseLim));
+ return R.data(attResFlseLimService.updateAttResFlseLimByGuid(editResInfoVO));
}
}
--
Gitblit v1.9.3