花城-智慧社区
parent: 63b224 | 补丁 | 提交对比
101captain
2022-08-08 0738bc12a588778c40c21a1874048c485f360ce1
refs
用户 101captain <237651143@qq.com>
星期一, 八月 8, 2022 16:20 +0800
提交者 101captain <237651143@qq.com>
星期一, 八月 8, 2022 16:20 +0800
提交0738bc12a588778c40c21a1874048c485f360ce1
目录 71daa739c1ddbbc3a6f62140f97ab1063298022d 目录 | zip | gz
parent 63b224f484539f7df68d90700596dbd4a8d18734 查看 | 对比
f961913156360edc2ad8b9febca8e4a7947848da 查看 | 对比 
Merge branch 'haucheng_panzhihua' into huacheng_test

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActIntegralUserDOMapper.xml
6个文件已修改
45 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientServiceCategoryDAO.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java 5 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml 16 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientServiceCategoryMapper.xml 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/CommunityJobHandler.java 14 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史