From 06620a6b0e64126e216edab8fced4597b38936b3 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期一, 21 六月 2021 13:55:11 +0800
Subject: [PATCH] [修改]合并test_excel分支到test分支。解决部分冲突。
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java
index 5ce5fe2..7aa9a1a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java
@@ -38,13 +38,13 @@
IPage<ComActNeighborCircleCommentAppVO> pageNeighborCommentByApp(Page page, @Param("neighborCircleAppDTO") ComActNeighborCircleDetailAppDTO neighborCircleAppDTO);
@Select("<script> " +
- "select nc.*,u.name as userName from com_act_neighbor_circle_comment nc left join sys_user u on nc.user_id=u.user_id " +
+ "select nc.*,u.nick_name as userName,u.phone as userPhone from com_act_neighbor_circle_comment nc left join sys_user u on nc.user_id=u.user_id " +
"<where>"+
- "<if test='dto.id != null and pageActWorkGuideDTO.dto!= 0l'>" +
- "circle_id = #{dto.id}"+
+ "<if test='dto.id != null and dto.id!= 0l'>" +
+ "nc.circle_id = #{dto.id}"+
" </if> " +
"</where>"+
" ORDER BY create_at"+
"</script>")
- IPage<ComActNeighborCommentByAdminVO> selectPageDetailNeighborComment(Page page, DetailNeighborAllCommentByAdminDTO dto);
+ IPage<ComActNeighborCommentByAdminVO> selectPageDetailNeighborComment(Page page,@Param("dto") DetailNeighborAllCommentByAdminDTO dto);
}
--
Gitblit v1.7.1