花城-智慧社区
parent: ccd28a | 补丁 | 提交对比
101captain
2022-06-29 6905023c1ce3239f5b2569caac6d151e9788841c
refs
用户 101captain <237651143@qq.com>
星期三, 六月 29, 2022 10:25 +0800
提交者 101captain <237651143@qq.com>
星期三, 六月 29, 2022 10:25 +0800
提交6905023c1ce3239f5b2569caac6d151e9788841c
目录 b07121126d1fe4693390f82b8203a91373996650 目录 | zip | gz
parent ccd28a0c35e8fff74da6ef63042fb8a896d78f7f 查看 | 对比
9fa69058350b4edeb9f20968d65fc0b5bb4f3272 查看 | 对比 
Merge branch 'huacheng_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_dev

 Conflicts:
	springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java
3个文件已修改
48 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java 1 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java 44 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史