From 830e18bcfac0a9ac2c5c9e175affc4b9c1889a58 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期四, 15 八月 2024 20:13:38 +0800
Subject: [PATCH] 测试git提交冲突问题
---
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java
index e52b152..c613780 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java
@@ -116,7 +116,7 @@
* @return
*/
@PostMapping(path="disabled")
- @SsoPowerAop(power = "10100011")
+ @SsoPowerAop(power = "10300003")
@Log("绂佺敤鎴栧惎鐢ㄨ川妫�椤圭洰")
public BaseResponse<Boolean> disabled(@RequestBody PltProductQualityInspectionItems reason){
int count = sv.disabled(reason.id,reason.disabled);
--
Gitblit v1.8.0