java/zhihuishenqu.git

花城-智慧社区

Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-08-17 e66b132b13fb50dd49361e19932791afc51b53a8

refs
用户	tangxiaobao <303826152@qq.com>
	星期二, 八月 17, 2021 15:49 +0800
提交者	tangxiaobao <303826152@qq.com>
	星期二, 八月 17, 2021 15:49 +0800
提交	e66b132b13fb50dd49361e19932791afc51b53a8
目录	d4f66a18b7fbeedb203f97541f9df80fbeb8e782 目录 \| zip \| gz
parent	cc2dc834d7e518052d98e48ad9a9e1bef81aece7 查看 \| 对比 82356163049821440e43dd2aca267131b3d59830 查看 \| 对比

Merge remote-tracking branch 'origin/test' into txb

9个文件已修改

1个文件已添加

	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamWishVO.java	23 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleTopicDOMapper.xml	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java	13 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史