Merge branch 'test' into 'master'

罗元桥

2021-08-23 f2a1360b9ac1806ffc51984ac30e8261c802e9cb

Merge branch 'test' into 'master'

Test

See merge request root/zhihuishequ!144

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java

@@ -204,6 +204,7 @@
            "p.transfer_time," +
            "p.is_report_urban," +
            "p.transfer_reason," +
            "ca.`name` as classifyName," +
            "p.urban_status " +
            "FROM " +
            "com_act_easy_photo p " +
@@ -212,6 +213,7 @@
            "LEFT JOIN sys_user su1 on p.complete_id=su1.user_id " +
            "LEFT JOIN com_act_easy_photo_user pu on p.id=pu.easy_photo_id " +
            "LEFT JOIN com_act c on p.community_id=c.community_id " +
            "left join com_act_easy_photo_classify ca on ca.id = p.classify_id " +
            "WHERE p.del_tag = 0 and p.id=#{id}")
    ComActEasyPhotoVO detailEasyPhoto(Long id);
    @Select("SELECT " +