From 66ff6f509bbbba04cffc428e7e1c886b534b4f13 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 17 八月 2023 17:09:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/resources/mapper/RepertoryMapper.xml | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/inventory-server/src/main/resources/mapper/RepertoryMapper.xml b/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
index e978167..8c1802e 100644
--- a/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
+++ b/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
@@ -6,9 +6,9 @@
name,
specifications,
quality_traceability,
- check_result,
user_name,
DATE_FORMAT(create_time, '%Y-%m-%d') '鍏ュ簱鏃ユ湡',
+ check_result,
note
from mom_ocean.repertory
<where>
@@ -24,9 +24,6 @@
</if>
<if test="type!=null ">
and type=#{type}
- </if>
- <if test="result!=null ">
- and check_result=#{result}
</if>
order by id desc
</where>
--
Gitblit v1.9.3