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

tangxiaobao

2021-08-26 a9f94d6e1126feba309e4132cb200f440348ce57

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java

@@ -286,8 +286,8 @@
                    cmActEasyPhotoDO.setTransferTime(nowDate);
                } else {
                    cmActEasyPhotoDO.setIsReportUrban(ComActEasyPhotoVO.isReportUrban.no);
                    cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getHandlerId());
                }
                cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getHandlerId());
                cmActEasyPhotoDO.setExamineAt(nowDate);
                cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
                if (StringUtils.isNotEmpty(comActEasyPhotoVO.getHandleResult())