From 70fb56a9fb61f70ccc55fcbc085b470e9423858a Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期一, 05 六月 2023 16:16:35 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java
index 67d98cb..beefce5 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java
@@ -63,6 +63,11 @@
*/
private String attrDataType;
+ /**
+ * 鏁版嵁绫诲瀷鏄剧ず瀵硅薄
+ */
+ private String attrDataTypeText;
+
/**
* 鏄惁鍙互涓虹┖
*/
@@ -72,7 +77,6 @@
* 榛樿鍊�
*/
private String defaultValue;
-
/**
* 灏忔暟绮惧害浣嶆暟
@@ -120,7 +124,7 @@
private boolean enumFlag;
/**
-z * 鍖呭惈鏋氫妇鐨勫��
+ * 鍖呭惈鏋氫妇鐨勫��
*/
private Map<String,String> enumItemMap;
--
Gitblit v1.9.3