java/zhihuishenqu.git

花城-智慧社区

Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

101captain

2022-08-01 997c719dacf2dffd4eb6f83a2cb1d5fa2529863d

refs
用户	101captain <237651143@qq.com>
	星期一, 八月 1, 2022 14:50 +0800
提交者	101captain <237651143@qq.com>
	星期一, 八月 1, 2022 14:50 +0800
提交	997c719dacf2dffd4eb6f83a2cb1d5fa2529863d
目录	382ca3e2c1d73b5292e3746b2194ebc0cf74a965 目录 \| zip \| gz
parent	f4d47d91a8bf41426497a0c42c10f5a78af0259b 查看 \| 对比 6a6f2aaa2e34f62ee320c2b9327dd566b6bfa350 查看 \| 对比

Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

 Conflicts:
	springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/MicroCommercialStreetApi.java

3个文件已修改

	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PagePartyOrganizationVO.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/grid_backstage/grid_backstage.iml	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/MicroCommercialStreetApi.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史