java/zhihuishenqu.git

花城-智慧社区

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-24 bd927f5c9f26d5ae89a272e56a4b3bd655bd148f

refs
用户	lidongdong <1459917685@qq.com>
	星期一, 十月 24, 2022 13:19 +0800
提交者	lidongdong <1459917685@qq.com>
	星期一, 十月 24, 2022 13:19 +0800
提交	bd927f5c9f26d5ae89a272e56a4b3bd655bd148f
目录	68c4ef44b37a628fb4d816e108887ee075976e55 目录 \| zip \| gz
parent	4ceec7d76e400e629a31e7cbf8120d88fd61dd52 查看 \| 对比 08a0533c9af51ec07a91147358893a2f2ec6f48f 查看 \| 对比

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

22个文件已修改

1个文件已添加

	flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingComPbDynVO.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxXCXTempSend.java	29 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEventTransferRecordMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/AcidMessage.java	22 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDO.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java	27 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderBargainServiceImpl.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderCollageTeamServiceImpl.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderServiceImpl.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml	21 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventTransferRecordMapper.xml	150 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/test/java/com/panzhihua/service_community/service/impl/ComEventServiceImplTest.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberWestServiceImpl.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbDynMapper.xml	71 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史