From 485f813f00da83b5aaa3f1ac7a43c704b260c06c Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 28 十月 2024 15:27:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SecretGradeController.java | 13 ++++---------
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java | 1 -
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java
index a7acfa1..07c2980 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java
@@ -75,7 +75,6 @@
}
}
-
/**
* 鑾峰彇褰撳墠妯″潡涓嬬殑瀛愭ā鍧�
* @return
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SecretGradeController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SecretGradeController.java
index 63802ba..2196026 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SecretGradeController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SecretGradeController.java
@@ -27,18 +27,13 @@
private SecretGradeServiceI secretGradeServiceI;
/**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
* 鑾峰彇瀵嗙骇绠＄悊閰嶇疆
* @return
*/
@GetMapping("/getSecretGradeConfig")
public BaseResult getSecretGradeConfig(){
try {
- return BaseResult.dataList(secretGradeServiceI.getSecretGradeConfig());
+ return BaseResult.success(secretGradeServiceI.getSecretGradeConfig());
} catch (PLException e) {
BaseResult objectBaseResult = new BaseResult<>();
objectBaseResult.setCode(Integer.parseInt(e.code));
@@ -52,9 +47,9 @@
* @param secretGradeMap
* @return
*/
- @PostMapping( "/secretGradeServiceI")
- @VciBusinessLog(operateName = "娣诲姞灞炴��")
- public BaseResult saveSecretGrade(Map<String, Boolean> secretGradeMap) {
+ @PostMapping( "/saveSecretGrade")
+ @VciBusinessLog(operateName = "鐢ㄦ埛/鏈哄櫒瀵嗙骇鍋滃惎閰嶇疆淇濆瓨")
+ public BaseResult saveSecretGrade(@RequestBody Map<String, Boolean> secretGradeMap) {
return secretGradeServiceI.saveSecretGrade(secretGradeMap);
}
--
Gitblit v1.9.3