From f2e8b17c7df35a8efb3b32d821bea54775b253ab Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 15 六月 2023 21:22:40 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
index 3a83061..08f5c65 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
@@ -49,7 +49,7 @@
@GetMapping("/gridCodeBasicSec")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鍒嗛〉 鐮佹鍩虹淇℃伅鍒楄〃", notes = "浼犲叆codeRuleVO")
- public R<IPage<CodeBasicSecVO>> gridCodeBasicSec(BladeQueryObject bladeQueryObject){
+ public R<IPage<CodeBasicSecVO>> gridCodeBasicSec(BladeQueryObject bladeQueryObject) throws Exception{
IPage<CodeBasicSecVO> codeRuleVOIPage = codeBasicSecService.gridCodeBasicSec(bladeQueryObject.getQuery().setAscs("ordernum"),bladeQueryObject.getConditionMap());
return R.data(codeRuleVOIPage);
}
--
Gitblit v1.9.3