From 7e5e4b43f4bcd7248325e1e1a5f10c61d64e93d3 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期六, 03 十二月 2022 13:12:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/resources/mapper/MatMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index 5f89c82..6ec9eef 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -42,8 +42,11 @@
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
-
<result column="stock" property="stock" />
+ <result column="store_max" property="storeMax" />
+ <result column="store_min" property="storeMin" />
+ <result column="store_max_date" property="storeMaxDate" />
+ <result column="inout_everyday" property="inoutEveryday" />
</resultMap>
<select id="listByPage" resultMap="BaseResultMap">
@@ -68,6 +71,9 @@
<if test="maktx != null and maktx != ''">
and mm.maktx like concat('%',#{maktx},'%')
</if>
+ <if test="specs != null and specs != ''">
+ and mm.specs like concat('%',#{specs},'%')
+ </if>
ORDER BY mm.create_time DESC
</select>
--
Gitblit v1.9.1