From 02dbaaa04bc443e860a715cf907bc0fb5c1a7da4 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 11 七月 2023 09:09:34 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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..7d512f5 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
@@ -14,9 +14,9 @@
* @date 2019/10/11 5:33 PM
*/
@Data
-@EqualsAndHashCode(callSuper = true)
+//@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "涓氬姟绫诲瀷鍖呭惈鐨勫睘鎬у璞�", description = "涓氬姟绫诲瀷鍖呭惈鐨勫睘鎬у璞�")
-public class BtmTypeAttributeVO extends BtmTypeAttribute {
+public class BtmTypeAttributeVO {
/**
* 绂佹淇敼杩欎釜鍊�
@@ -63,16 +63,20 @@
*/
private String attrDataType;
+ /**
+ * 鏁版嵁绫诲瀷鏄剧ず瀵硅薄
+ */
+ private String attrDataTypeText;
+
/**
* 鏄惁鍙互涓虹┖
*/
- private boolean nullableFlag;
+ private boolean nullableFlag = true;
/**
* 榛樿鍊�
*/
private String defaultValue;
-
/**
* 灏忔暟绮惧害浣嶆暟
@@ -120,7 +124,7 @@
private boolean enumFlag;
/**
-z * 鍖呭惈鏋氫妇鐨勫��
+ * 鍖呭惈鏋氫妇鐨勫��
*/
private Map<String,String> enumItemMap;
--
Gitblit v1.9.3