Merge branch 'haucheng_panzhihua' into local_20221024

yanghui

2022-11-01 03dfa1de5279c75a4206f59226d871823bdbe72e

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

@@ -389,6 +389,9 @@
                break;
            default:
                break;
        }
        if (!ObjectUtils.isEmpty(comActEasyPhotoVO.getIsReportDpc())){
            cmActEasyPhotoDO.setIsReportDpc(comActEasyPhotoVO.getIsReportDpc());
        }
        if (!type.equals(3)) {
            int update = comActEasyPhotoDAO.updateById(cmActEasyPhotoDO);