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-omd/src/main/resources/mapper/AttributeMapper.xml | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/AttributeMapper.xml b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/AttributeMapper.xml
index 2baadc1..15d3763 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/AttributeMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/AttributeMapper.xml
@@ -51,8 +51,7 @@
</select>
<select id="selectApplyRange" resultType="com.vci.ubcs.omd.entity.BtmType">
select
- btm.name,
- btm.ID
+ btm.*
from pl_omd_btm_type btm
join pl_omd_btm_type_attribute btmAttr on btmAttr.pk_btm_type = btm.oid
join <include refid="tableName"/> attr on attr.id = btmAttr.id
--
Gitblit v1.9.3