花城-智慧社区
parent: 056e10 | 补丁 | 提交对比
zhaozhengjie
2022-09-16 f4c8664c2d1c6d6e62f75433a27c5645942d5e85
refs
用户 zhaozhengjie <237651143@qq.com>
星期五, 九月 16, 2022 16:08 +0800
提交者 zhaozhengjie <237651143@qq.com>
星期五, 九月 16, 2022 16:08 +0800
提交f4c8664c2d1c6d6e62f75433a27c5645942d5e85
目录 bd39f6189c1b4218751d91ab68f097fe8c43ca15 目录 | zip | gz
parent 056e10e2705661139d2fc0f28fb126635ed69082 查看 | 对比
f8db6bfab52a914a8e4b6465390bb1e94f20ac19 查看 | 对比 
Merge branch 'acid_push' into huacheng_test

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
5个文件已修改
20 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynTypeVO.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynTypeDOMapper.xml 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史