java/zhihuishenqu.git

花城-智慧社区

mitao

7 天以前 ca19278469a1d7f133a3684b844257c08c9d5d03

refs
用户	mitao <2763622819@qq.com>
	星期四, 五月 15, 2025 22:22 +0800
提交者	mitao <2763622819@qq.com>
	星期四, 五月 15, 2025 22:22 +0800
提交	ca19278469a1d7f133a3684b844257c08c9d5d03
目录	708ae90ba1f7199a7c84efc82805a90e21e1f506 目录 \| zip \| gz
parent	21488a55ba76ae4f1296b608fbcdf1f06036db64 查看 \| 对比 dc90deebee3f527626fba78090919182a856d082 查看 \| 对比

Merge branch 'dev-2.0.0' into dev-2.0.1

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java

3个文件已修改

	springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java	18 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java	23 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/PartyMemberMapper.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史