From ebea64fcbd2b7881863755ec38e5cf37cdb60658 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 31 五月 2021 14:49:18 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
index 41b5667..c714db6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
@@ -36,6 +36,8 @@
             "p.`photo_path_list`,\n" +
             "p.create_at,\n" +
             "p.feedback_at,\n" +
+            "p.is_report,\n" +
+            "p.is_publicity,\n" +
             "p.examine_at \n" +
             "FROM\n" +
             "com_act_easy_photo p\n" +
@@ -91,6 +93,8 @@
             "p.`photo_path_list`,\n" +
             "p.create_at,\n" +
             "p.feedback_at,\n" +
+            "p.is_report,\n" +
+            "p.is_publicity,\n" +
             "p.examine_at \n" +
             "FROM\n" +
             "com_act_easy_photo p\n" +
@@ -179,7 +183,7 @@
             "SELECT\n" +
             "'1' type\n" +
             "FROM\n" +
-            " p.del_tag = 0 and com_act_easy_photo p \n" +
+            " com_act_easy_photo p \n" +
             "WHERE\n" +
             " p.del_tag = 0 and p.community_id = #{communityId} \n" +
             "AND p.`status` = 2 and p.is_need_feed_back=1 and p.handler_id=#{userId}\n"

--
Gitblit v1.7.1