From c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf Mon Sep 17 00:00:00 2001 From: XiaoRuby <3114200645@qq.com> Date: 星期四, 27 七月 2023 16:02:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- standard-server/src/main/resources/mapper/MaterialMapper.xml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/standard-server/src/main/resources/mapper/MaterialMapper.xml b/standard-server/src/main/resources/mapper/MaterialMapper.xml index 7f77634..8853a62 100644 --- a/standard-server/src/main/resources/mapper/MaterialMapper.xml +++ b/standard-server/src/main/resources/mapper/MaterialMapper.xml @@ -6,8 +6,9 @@ select id, name from lims_laboratory.material where state = 1 + and type = #{type} order by create_time desc - limit #{num1},#{num2} + limit #{num1},#{num2} </select> <select id="selectMaterialById" resultType="Map"> select m.id, -- Gitblit v1.9.3