From 6815206f357f19ba27593e5bfae01f5eccf9b2d8 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 24 八月 2023 18:43:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/resources/mappers/PlansExtMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/src/main/resources/mappers/PlansExtMapper.xml b/server/src/main/resources/mappers/PlansExtMapper.xml
index 633bb9c..ee7c019 100644
--- a/server/src/main/resources/mappers/PlansExtMapper.xml
+++ b/server/src/main/resources/mappers/PlansExtMapper.xml
@@ -1254,12 +1254,12 @@
<if test="usermodelInvalidTime != null">
AND `usermodel`.`INVALID_TIME` = #{usermodelInvalidTime}
</if>
- <if test="startDate != null">
+ <!--<if test="startDate != null">
AND `a`.`PLAN_DATE` >= #{startDate}
</if>
<if test="endDate != null">
AND #{endDate} >= `a`.`PLAN_DATE`
- </if>
+ </if>-->
<if test="mixParam != null and mixParam!=''">
AND (mmodel.name like concat('%',#{mixParam},'%') or mmodel.code like concat('%',#{mixParam},'%') or pmodel.name like concat('%',#{mixParam},'%'))
</if>
--
Gitblit v1.9.3