Merge remote-tracking branch 'origin/dev' into dev

101captain

2022-03-03 1ebbd7d5c83cc81e5cf94aa4d2a87a4ecd8a03c3

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

@@ -216,6 +216,9 @@
            "p.urban_status, " +
            "p.img_width, " +
            "p.img_height, " +
            "p.evaluate_date, " +
            "caepe.score," +
            "caepe.`content`, " +
            "p.handle_photo_list " +
            "FROM " +
            "com_act_easy_photo p " +
@@ -225,6 +228,7 @@
            "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 " +
            "left join com_act_easy_photo_evaluate as caepe on caepe.service_id = p.id and caepe.service_type = 1 " +
            "WHERE p.del_tag = 0 and p.id=#{id}")
    ComActEasyPhotoVO detailEasyPhoto(Long id);
    @Select("SELECT " +