From f2e8b17c7df35a8efb3b32d821bea54775b253ab Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 15 六月 2023 21:22:40 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/LinkTypeMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/LinkTypeMapper.xml b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/LinkTypeMapper.xml
index c21779e..0034781 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/LinkTypeMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/LinkTypeMapper.xml
@@ -23,7 +23,7 @@
</resultMap>
<sql id="base_query_column">
- oid, id, name, descrption, shape, impl_class, from_btm_type, from_btm_type_name,
+ oid, id, name, description, shape, impl_class, from_btm_type, from_btm_type_name,
to_btm_type, to_btm_type_name, btm_name, owner, creator, create_time, last_modifier, last_modify_time,
ts, domain
</sql>
@@ -31,4 +31,10 @@
<sql id="tableName">
pl_omd_link_type
</sql>
+
+ <select id="selectAll" resultMap="BaseResultMap">
+ select <include refid="base_query_column"/>
+ from <include refid="tableName" />
+ </select>
+
</mapper>
--
Gitblit v1.9.3