From 1a054c486c9037b7cb0bca5c4472c628d1d1c36c Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期一, 28 六月 2021 16:54:06 +0800 Subject: [PATCH] 解决代码被合并后删除问题 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.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/ComActActivityDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java index 777d733..6c2f255 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java @@ -311,7 +311,7 @@ " AND DATE_FORMAT(caa.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{actActivityListDTO.endTime} " + " </if> " + "<if test='actActivityListDTO.type!=null'>" + - " AND caa.status = #{actActivityListDTO.status} " + + " AND caa.type = #{actActivityListDTO.type} " + " </if> " + " </where> "+ "ORDER BY " + -- Gitblit v1.7.1