Merge branch 'test' into 'master'

罗元桥

2021-07-24 cbf825f4e63e77241a11ec90841637991e43940f

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

@@ -45,6 +45,7 @@
            "p.is_report, " +
            "p.is_publicity, " +
            "p.activity_type, " +
            "p.activity_id, " +
            "p.activity_amount, " +
            "p.examine_at  " +
            "FROM " +
@@ -114,6 +115,7 @@
            "p.is_publicity, " +
            "p.activity_type, " +
            "p.activity_amount, " +
            "p.activity_id, " +
            "p.examine_at  " +
            "FROM " +
            "com_act_easy_photo p " +
@@ -190,6 +192,7 @@
            "p.handle_result, " +
            "p.photo_path_list, " +
            "p.activity_type, " +
            "p.activity_id, " +
            "p.activity_amount, " +
            "count(pu.id)giveThumbsUpNum, " +
            "p.handle_photo_list " +