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-base/src/main/java/com/dy/pmsBase/role/RoleSv.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleSv.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleSv.java
index eec6e82..ad67043 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleSv.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleSv.java
@@ -55,6 +55,7 @@
* @param disabled
* @return
*/
+ @Transactional
public int disabled(Long id,Boolean disabled) {
BaRole role=new BaRole();
role.id=id;
--
Gitblit v1.8.0