From 0135fa289418c5fd231fa4e7c60ee7b8f06f17a7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 06 五月 2025 19:29:11 +0800
Subject: [PATCH] Merge branch 'dev-2.0.1' of http://120.76.84.145:10101/gitblit/r/java/zhihuishenqu into dev-2.0.1
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java
index 63f5fe5..0caf05b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java
@@ -101,11 +101,12 @@
* @param loginUserInfo
*/
@Override
- public void freeze(Long id, SystemUserVo loginUserInfo) {
+ public PartyMember freeze(Long id, SystemUserVo loginUserInfo) {
PartyMember partyMember = getById(id);
partyMember.setFreezeStatus(partyMember.getFreezeStatus() == 1 ? 0 : 1);
partyMember.setUpdateBy(Long.parseLong(loginUserInfo.getId().toString()));
updateById(partyMember);
+ return partyMember;
}
@Override
@@ -311,10 +312,11 @@
* @param loginUserInfo
*/
@Override
- public void audit(PartyMemberDTO dto, SystemUserVo loginUserInfo) {
+ public PartyMember audit(PartyMemberDTO dto, SystemUserVo loginUserInfo) {
PartyMember partyMember = BeanUtil.copyProperties(dto, PartyMember.class);
partyMember.setUpdateBy(Long.parseLong(loginUserInfo.getId().toString()));
updateById(partyMember);
+ return this.getById(dto.getId());
}
@Override
--
Gitblit v1.7.1