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/proUR/ProURSv.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURSv.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURSv.java
index 65db33c..3cd3e14 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURSv.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURSv.java
@@ -70,6 +70,7 @@
return rsVo ;
}
+ @Transactional
public int disabled(Long id, Boolean disabled) {
PltProductUnqualifiedReason reason = new PltProductUnqualifiedReason();
reason.setId(id);
--
Gitblit v1.8.0