花城-智慧社区
parent: 68d993 | 补丁 | 提交对比
tangxiaobao
2021-07-31 cc0569d48030733d420a4cd77f3f4da405d34372
refs
用户 tangxiaobao <303826152@qq.com>
星期六, 七月 31, 2021 21:05 +0800
提交者 tangxiaobao <303826152@qq.com>
星期六, 七月 31, 2021 21:05 +0800
提交cc0569d48030733d420a4cd77f3f4da405d34372
目录 fb82b5b547f812c704890207b4ead083617351c7 目录 | zip | gz
parent 68d9932527d3fc879b0422d7d9c29d3f9437c65c 查看 | 对比
5cc66034f6d2dba30d2132078b2730f1dd4abf86 查看 | 对比 
Merge remote-tracking branch 'origin/test' into txb

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwRotaDAO.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwRotaMapper.xml
6个文件已修改
35 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaPersonVO.java 5 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwRotaDAO.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java 9 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java 10 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwRotaMapper.xml 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史