From 177dd707939f7a8de597b1940725445a46cbdf77 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 16 六月 2021 21:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_screen' into test_screen
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
index 05aadd9..94cf432 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -274,7 +274,7 @@
List<IndexPopulationSexStatisticsVO> getScreenIndexByPopulationSex(@Param("communityId") Long communityId);
@Select("SELECT " +
- " e.create_at, " +
+ " e.happen_time as createAt, " +
" e.event_des, " +
" e.event_deal_status " +
"FROM " +
@@ -586,7 +586,7 @@
@Select("SELECT " +
" su.nick_name AS userName, " +
" su.image_url AS imageUrl, " +
- " e.create_at, " +
+ " e.happen_time as createAt, " +
" e.event_des, " +
" e.danger_level, " +
" e.urgent, " +
@@ -606,7 +606,7 @@
" AND e.event_deal_status = 1 " +
" AND e.event_category = 1 " +
"ORDER BY " +
- " e.create_at DESC " +
+ " e.happen_time DESC " +
" LIMIT 1")
EventNewStatisticsVO getEventScreenRightTop(@Param("communityId") Long communityId);
--
Gitblit v1.7.1