From 49fef33cebe18fc10430147dbbb867c67d97750b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 05 十二月 2023 16:19:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java
index d55e13a..9b44d22 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java
@@ -49,9 +49,9 @@
*/
@GetMapping("/gridCodeFixedValue")
@ApiOperationSupport(order = 1)
- @ApiOperation(value = "鍒嗛〉 鐮佹鍩虹淇℃伅鍒楄〃", notes = "CodeFixedValueVO")
+ @ApiOperation(value = "鍥哄畾鐮佹鐨勭爜鍊煎垪琛�", notes = "CodeFixedValueVO")
public R<IPage<CodeFixedValueVO>> gridCodeFixedValue(CodeFixedValueVO codeFixedValueVO, Query query){
- return R.data(codeFixedValueService.gridCodeFixedValue(codeFixedValueVO, Condition.getPage(query.setAscs("ordernum"))));
+ return R.data(codeFixedValueService.gridCodeFixedValue(codeFixedValueVO, Condition.getPage(query.setAscs("orderNum"))));
}
/**
@@ -132,7 +132,7 @@
dtoList.add(codeFixedValueDTO);
}
String codefixedsecoid = (String) param.get("codeFixedSecOid");
- VciBaseUtil.alertNotNull(dtoList,"鐮佸�煎璞￠泦鍚�",codefixedsecoid,"鍥哄畾鐮佹鐨勪富閿�");
+ VciBaseUtil.alertNotNull(codefixedsecoid,"鍥哄畾鐮佹鐨勪富閿�");
if (CollectionUtils.isEmpty(dtoList)){
return R.status(codeFixedValueService.batchDeleteBySecOid(codefixedsecoid));
}
--
Gitblit v1.9.3