java/zhihuishenqu.git

花城-智慧社区

yanghui

2022-11-11 50a71933495034686c22266b2818c138143c913c

refs
用户	yanghui <2536613402@qq.com>
	星期五, 十一月 11, 2022 10:00 +0800
提交者	yanghui <2536613402@qq.com>
	星期五, 十一月 11, 2022 10:00 +0800
提交	50a71933495034686c22266b2818c138143c913c
目录	3dfae701321683101830ff24f1068b346fcb02fb 目录 \| zip \| gz
parent	ff87de38cd60344ebc875385a02b8f74481b16d0 查看 \| 对比 ad2201f809f45cbbe2e63a829e4c93a9c7b7f67c 查看 \| 对比

Merge branch 'local_20221104' into haucheng_panzhihua

6个文件已修改

	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientMerchantDTO.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientMerchantDO.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史