From 7d2abb005f5dde19542a2d21c142680098236901 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 16 六月 2023 16:56:09 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/ValueRangeMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/ValueRangeMapper.xml b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/ValueRangeMapper.xml
index ca9c542..356ac60 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/ValueRangeMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/ValueRangeMapper.xml
@@ -72,7 +72,7 @@
</where>
</select>
- <select id="queryByCombinationIds" resultType="java.util.List">
+ <select id="queryByCombinationIds" resultType="String">
SELECT "VALUE" FROM PL_SYS_VALUE_RANGE PSVR
WHERE PSVR.COMBINATION_ID IN (
<foreach collection="combinationIds" item="id" separator=",">
--
Gitblit v1.9.3