From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期四, 13 三月 2025 10:46:24 +0800 Subject: [PATCH] 分支合并冲突解决 --- inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml index d6baaef..2af95a9 100644 --- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml +++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml @@ -840,7 +840,7 @@ </select> <select id="seldepLimsId" resultType="java.lang.String"> - select name + select `name` from department_lims where id = #{depLimsId} </select> -- Gitblit v1.9.3