From 336eb77c1a07ca3e3ead4482b51f848fa16ab3b7 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期日, 12 十一月 2023 20:15:38 +0800
Subject: [PATCH] 自定义流水相关开发

---
 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java |   19 ++++++++++++++-----
 1 files changed, 14 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..44334d2 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
@@ -1,5 +1,7 @@
 package com.vci.ubcs.omd.vo;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.vci.ubcs.omd.entity.BtmTypeAttribute;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -14,9 +16,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 +65,20 @@
      */
     private String attrDataType;
 
+	/**
+	 * 鏁版嵁绫诲瀷鏄剧ず瀵硅薄
+	 */
+	private String  attrDataTypeText;
+
     /**
      * 鏄惁鍙互涓虹┖
      */
-    private boolean nullableFlag;
+    private boolean nullableFlag = true;
 
     /**
      * 榛樿鍊�
      */
     private String defaultValue;
-
 
     /**
      * 灏忔暟绮惧害浣嶆暟
@@ -120,7 +126,7 @@
     private boolean enumFlag;
 
     /**
-z     * 鍖呭惈鏋氫妇鐨勫��
+     * 鍖呭惈鏋氫妇鐨勫��
      */
     private Map<String,String> enumItemMap;
 
@@ -157,5 +163,8 @@
     /**
      * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
      */
+	@JsonFormat(
+		pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+	)
     private Date ts;
 }

--
Gitblit v1.9.3