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-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