From 92e7dde00a56aff46e01efe72e1f7ab9b76dcf69 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 05 七月 2023 19:02:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrMappingMapper.xml b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
index e07dcc1..dd2ee92 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
@@ -35,7 +35,7 @@
             <result column="SOURCECLSFNAME" property="sourceClassifyName"/>
             <result column="TARGETATTRID" property="targetAttrId"/>
             <result column="TARGETCLSFID" property="targetClassifyId"/>
-            <result column="VIEWMODEID" property="viewModeId"/>
+           <!-- <result column="VIEWMODEID" property="viewModeId"/>-->
             <result column="VIEWMODENAME" property="viewModelName"/>
             <result column="TARGETATTRKEY" property="targetAttrKey"/>
             <result column="TARGETATTRNAME" property="targetAttrName"/>

--
Gitblit v1.9.3