Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-09-07 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af

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

@@ -176,6 +176,7 @@
            "p.id, " +
            "p.sponsor_id, " +
            "p.feedback_at, " +
            "p.is_publicity, " +
            "p.examine_at, " +
            "p.create_at, " +
            "u.`name` sponsorName, " +
@@ -185,6 +186,7 @@
            "u.`image_url`, " +
            "u.phone, " +
            "p.detail, " +
            "p.lng_lat, " +
            "p.is_need_feed_back, " +
            "p.examine_at, " +
            "p.status, " +