Merge branch 'test_future_wangge' into test

CeDo

2021-06-07 f1afc9dd47bc8e9d4d2c86a5bbd099ee0d7824f2

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

@@ -155,6 +155,7 @@
        }
        BeanUtils.copyProperties(photoHandleDTO,easyPhotoDO);
        easyPhotoDO.setHandleStatus(ComActEasyPhotoDO.handleStatus.yes);
        easyPhotoDO.setFeedbackAt(new Date());
        //关联随手拍类型
        if(!photoHandleDTO.getEasyTypeIds().isEmpty()){
            List<ComActEasyPhotoTypeRelationDO> typeRelationDOList = new ArrayList<>();