From 09101577baa4b844e308238d1d4ac1972d660577 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 17 十二月 2025 16:47:22 +0800
Subject: [PATCH] 生成站点电路试验报告(天线)合并单元格
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index df4a6f0..fb9385f 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -257,7 +257,7 @@
method,
man_day,
bsm,
- ask,
+ ip.ask,
`last_value`,
ip.ins_result ip_ins_result,
state,
@@ -277,6 +277,7 @@
ipr.after_note,
ipr.test_result,
ipr2.frequency,
+ ipr2.ask ask2,
ipr2.often,
ipr2.port,
ipr2.angle,
@@ -330,7 +331,7 @@
method,
man_day,
bsm,
- ask,
+ ip.ask,
`last_value`,
ip.ins_result ip_ins_result,
state,
@@ -350,6 +351,7 @@
ipr.after_note,
ipr.test_result,
ipr2.frequency,
+ ipr2.ask ask2,
ipr2.often,
ipr2.port,
ipr2.angle,
@@ -533,7 +535,7 @@
method,
man_day,
bsm,
- ask,
+ ip.ask,
`last_value`,
ip.ins_result ip_ins_result,
state,
@@ -553,6 +555,7 @@
ipr.after_note,
ipr.test_result,
ipr2.frequency,
+ ipr2.ask ask2,
ipr2.often,
ipr2.port,
ipr2.angle,
@@ -604,7 +607,7 @@
method,
man_day,
bsm,
- ask,
+ ip.ask,
`last_value`,
ip.ins_result ip_ins_result,
state,
@@ -624,6 +627,7 @@
ipr.after_note,
ipr.test_result,
ipr2.frequency,
+ ipr2.ask ask2,
ipr2.often,
ipr2.port,
ipr2.angle,
@@ -673,7 +677,7 @@
method,
man_day,
bsm,
- ask,
+ ip.ask,
`last_value`,
ip.ins_result ip_ins_result,
state,
@@ -693,6 +697,7 @@
ipr.after_note,
ipr.test_result,
ipr2.frequency,
+ ipr2.ask ask2,
ipr2.often,
ipr2.port,
ipr2.angle,
@@ -837,6 +842,7 @@
</resultMap>
<resultMap id="insProductResult2" type="com.yuanchu.mom.pojo.InsProductResult2">
<result column="frequency" property="frequency" jdbcType="VARCHAR"/>
+ <result column="ask2" property="ask" jdbcType="VARCHAR"/>
<result column="often" property="often" jdbcType="VARCHAR"/>
<result column="port" property="port" jdbcType="VARCHAR"/>
<result column="angle" property="angle" jdbcType="VARCHAR"/>
--
Gitblit v1.9.3