From cbf825f4e63e77241a11ec90841637991e43940f Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期六, 24 七月 2021 18:11:28 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java |    3 +++
 1 files changed, 3 insertions(+), 0 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 9db6b68..211c4f3 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
@@ -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 " +

--
Gitblit v1.7.1