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-product/src/main/java/com/dy/pmsProduct/workStation/WorkStationCtl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/workStation/WorkStationCtl.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/workStation/WorkStationCtl.java
index 2acc575..c26b6af 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/workStation/WorkStationCtl.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/workStation/WorkStationCtl.java
@@ -44,7 +44,7 @@
*/
@GetMapping(path="delete")
@SsoPowerAop(power = "10300001")
- @Log("鍒犻櫎浜у搧淇℃伅")
+ @Log("鍒犻櫎宸ョ珯浣跨敤鎯呭喌淇℃伅")
public BaseResponse<Boolean> delete(String id){
int count = sv.delete(Long.parseLong(id));
if (count <= 0) {
--
Gitblit v1.8.0