java/zhihuishenqu.git

花城-智慧社区

Merge remote-tracking branch 'origin/master'

101captain

2021-12-28 40b94b4088b6905cef0e62cea7dafd326ed06c87

refs
用户	101captain <237651143@qq.com>
	星期二, 十二月 28, 2021 15:21 +0800
提交者	101captain <237651143@qq.com>
	星期二, 十二月 28, 2021 15:21 +0800
提交	40b94b4088b6905cef0e62cea7dafd326ed06c87
目录	4d1418107c472c078e338fe2e50d511ee36a8ccb 目录 \| zip \| gz
parent	a1403a3bf720c3bce6407e177f900b6f0e71d7aa 查看 \| 对比 e523c26ef649999c56185a88f853ff5f92f1b20d 查看 \| 对比

Merge remote-tracking branch 'origin/master'

8个文件已修改

	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussCommentDOMapper.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPbMemberMapper.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史