From 43b6ab16ed0480a09dce7b7c5a3ecdfbef3e41a5 Mon Sep 17 00:00:00 2001 From: baizonghao <1719256278@qq.com> Date: 星期六, 04 三月 2023 12:07:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml b/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml index e4f5ee4..a585c28 100644 --- a/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml +++ b/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml @@ -34,7 +34,7 @@ <if test="type == '03' and type != null and type !='' "> t1.type='03' </if> - <if test="type == null and type =='' "> + <if test="type == '01' and type != null and type !='' "> t1.type='02' or t1.type='01' </if> <if test="startTime != '' and endTime != '' and startTime != null and endTime != null"> -- Gitblit v1.8.0