花城-智慧社区
parent: f465f7 | 补丁 | 提交对比
101captain
2021-12-14 56a777ac578a88e480783cd9dc0580abf3358c21
refs
用户 101captain <237651143@qq.com>
星期二, 十二月 14, 2021 10:41 +0800
提交者 101captain <237651143@qq.com>
星期二, 十二月 14, 2021 10:41 +0800
提交56a777ac578a88e480783cd9dc0580abf3358c21
目录 bf8c8146f3d350e57e51997d4292f3fd8d911754 目录 | zip | gz
parent f465f75232244069e3fbb71ac9e01ec09c6158ba 查看 | 对比
32750154321878aabb2e96248ef9cbfa85036758 查看 | 对比 
Merge remote-tracking branch 'origin/west_bigscreen_dev' into west_bigscreen_dev

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
7个文件已修改
1个文件已添加
121 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventComprehensiveGovernanceStatisticsVO.java 43 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java 5 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java 9 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java 12 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml 32 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史