From db1c3c5b3670639fd1dfc5de0fe75ce6f02f732e Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期三, 31 五月 2023 14:40:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrMappingMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrMappingMapper.xml b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
similarity index 90%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
index a6a0649..e07dcc1 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.DockingPreAttrMappingMapper">
+<mapper namespace="com.vci.ubcs.code.webservice.mapper.DockingPreAttrMappingMapper">
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
-    <resultMap id="DockingPreAttrMappingResultMap" type="com.vci.ubcs.code.entity.DockingPreAttrMapping">
+    <resultMap id="plDockingPreAttrMappingResultMap" type="com.vci.ubcs.code.webservice.entity.DockingPreAttrMapping">
             <result column="OID" property="oid"/>
             <result column="REVISIONOID" property="revisionOid"/>
             <result column="NAMEOID" property="nameOid"/>
@@ -36,7 +36,7 @@
             <result column="TARGETATTRID" property="targetAttrId"/>
             <result column="TARGETCLSFID" property="targetClassifyId"/>
             <result column="VIEWMODEID" property="viewModeId"/>
-            <result column="VIEWMODENAME" property="viewModeName"/>
+            <result column="VIEWMODENAME" property="viewModelName"/>
             <result column="TARGETATTRKEY" property="targetAttrKey"/>
             <result column="TARGETATTRNAME" property="targetAttrName"/>
             <result column="SOURCEATTRKEY" property="sourceAttrKey"/>

--
Gitblit v1.9.3