From ea4d3ff1ec0075eab10ef6c214653298f34d8185 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期六, 26 八月 2023 16:22:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/ProductModelMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/ProductModelMapper.xml b/standard-server/src/main/resources/mapper/ProductModelMapper.xml
index 74f5a68..8488506 100644
--- a/standard-server/src/main/resources/mapper/ProductModelMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductModelMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.limslaboratory.mapper.ProductModelMapper">
<resultMap id="selectproductModelMap" type="map">
- <id property="father" column="father"/>
+ <id property="name" column="father"/>
<collection property="children" resultMap="selectproductModelTowMap" javaType="List"/>
</resultMap>
@@ -35,9 +35,9 @@
</update>
<!--娣诲姞鏍囧噯閫夋嫨椤圭洰鍒嗙粍-->
<select id="selectfather" resultType="java.lang.String">
- select distinct father
- from lims_laboratory.product_model
- where state = 1
+ SELECT DISTINCT father
+ FROM lims_laboratory.product_model
+ WHERE state = 1
</select>
<!--鏌ヨ椤圭洰妯＄増鏍规嵁鏍峰搧鍚�-->
@@ -56,4 +56,4 @@
from lims_laboratory.product_model
where state = 1
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3