From 9cc2be00cf833beddfc4fca148b96f0a1f75bb8c Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期六, 08 五月 2021 13:46:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
index 0873f6c..e9c4e6e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
@@ -51,7 +51,7 @@
             " order by (canc.last_views_num + canc.last_comment_num + canc.last_fabulous_num) desc " +
             " </if> " +
             "<if test='neighborCircleAppDTO.type != null and neighborCircleAppDTO.type == 2'>" +
-            " order by canc.reply_at desc,canc.create_at desc " +
+            " order by canc.create_at desc " +
             " </if> " +
             "<if test='neighborCircleAppDTO.type != null and neighborCircleAppDTO.type == 3'>" +
             " order by (canc.views_num + canc.comment_num + canc.fabulous_num) desc " +

--
Gitblit v1.7.1