From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/resources/mapper/PlanMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/PlanMapper.xml b/inspection-server/src/main/resources/mapper/PlanMapper.xml
index bf79c9d..d466f4e 100644
--- a/inspection-server/src/main/resources/mapper/PlanMapper.xml
+++ b/inspection-server/src/main/resources/mapper/PlanMapper.xml
@@ -8,7 +8,7 @@
<result property="inspectionStatus" column="inspectionStatus"/>
<result property="startTime" column="startTime"/>
<result property="endTime" column="endTime"/>
- <collection property="chldren" resultMap="selectAllPlanMapTowsMap" javaType="List"/>
+ <collection property="children" resultMap="selectAllPlanMapTowsMap" javaType="List"/>
</resultMap>
<resultMap id="selectAllPlanMapTowsMap" type="map">
<id property="pid" column="pid"/>
@@ -16,6 +16,7 @@
<result property="unit" column="unit"/>
<result property="required" column="required"/>
<result property="internal" column="internal"/>
+ <result property="testValue" column="testValue"/>
<result property="testState" column="testState"/>
<result property="checker" column="checker"/>
<result property="instrumentname" column="instrumentname"/>
@@ -33,6 +34,7 @@
ip.unit,
required,
internal,
+ test_value testValue,
test_state testState,
u.name checker,
equipment_name instrumentname
--
Gitblit v1.9.3