Merge branch 'test' into 'master'

罗元桥

2021-06-29 cd7bec2448443f88eee6f73df68df829fc95eed9

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

@@ -166,6 +166,8 @@
            "su.`name`,\n" +
            "p.handle_result,\n" +
            "p.photo_path_list,\n" +
            "p.activity_type,\n" +
            "p.activity_amount,\n" +
            "count(pu.id)giveThumbsUpNum,\n" +
            "p.handle_photo_list\n" +
            "FROM\n" +
@@ -213,6 +215,8 @@
            "p.`photo_path_list`,\n" +
            "p.create_at,\n" +
            "p.feedback_at,\n" +
            "p.activity_type,\n" +
            "p.activity_amount,\n" +
            "p.examine_at \n" +
            "FROM\n" +
            "com_act_easy_photo p\n" +