From 83488c1cbce53028c9602d2fc96005528d11fb4c Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 08 八月 2023 14:08:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/MaterialMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/MaterialMapper.xml b/standard-server/src/main/resources/mapper/MaterialMapper.xml
index 1903342..661b8fd 100644
--- a/standard-server/src/main/resources/mapper/MaterialMapper.xml
+++ b/standard-server/src/main/resources/mapper/MaterialMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.yuanchu.limslaboratory.mapper.MaterialMapper">
<select id="selectMaterialLimit" resultType="Map">
- select id, name
+ select id,code, name
from lims_laboratory.material
where state = 1
and type = #{type}
@@ -28,7 +28,7 @@
lims_laboratory.serial_number sn
where m.specifications_id = s.id
and s.serial_id = sn.id
- and m.id=#{materialId}
+ and m.id=#{materialId}
</select>
<resultMap id="OneLevelTreeMap" type="Map">
--
Gitblit v1.9.3