From 6db5272e2df8a27942f10c03d93183fc9b01e22a Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 04 九月 2023 18:05:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
base-server/src/main/resources/mapper/TechniqueModelMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/base-server/src/main/resources/mapper/TechniqueModelMapper.xml b/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
index aed3cf0..0ec473a 100644
--- a/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
+++ b/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
@@ -8,8 +8,8 @@
</resultMap>
<resultMap id="selectAllTequeMaps" type="map">
<id property="id" column="id"/>
- <result property="name" column="father"/>
- <result property="name" column="unit"/>
+ <result property="father" column="father"/>
+ <result property="unit" column="unit"/>
<result property="name" column="name"/>
</resultMap>
<select id="selectAllTeque" resultMap="selectAllTequeMap">
@@ -37,7 +37,7 @@
<resultMap id="chooseProMaps" type="map">
<id property="id" column="technicalModelId"/>
<result property="name" column="name"/>
- <result property="name" column="unit"/>
+ <result property="unit" column="unit"/>
</resultMap>
<select id="choosePro" resultMap="chooseProMap">
select father,
--
Gitblit v1.9.3