java/zhihuishenqu.git

Merge branch 'sanshuohuitang_dev' into huacheng_test

# Conflicts:
# springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java

			@@ -243,7 +243,7 @@
			comEventTransferRecord.setEventResult(comEvent.getEventSucceed());
			comEventTransferRecord.setEventStatus(comEvent.getEventProcessStatus());
			comEventTransferRecord.setId(Snowflake.getId());
			saveEventImageList(comEvent.getImages(),comEvent.getId(),comEventTransferRecord.getId(),4);
			//saveEventImageList(comEvent.getImages(),comEvent.getId(),comEventTransferRecord.getId(),4);
			saveEventImageList(comEventConciliationVO.getImages(), comEventConciliationVO.getId(),comEventTransferRecord.getId(),4);
			comEventTransferRecordService.insertComEventTransferRecord(comEventTransferRecord);
			return flag > 0 ? R.ok() : R.fail(ReturnMsgConstants.UPDATE_FALSE);
			@@ -506,5 +506,4 @@
			Integer count = baseMapper.selectCount(queryWrapper);
			return count > 0;
			}

			}