From 54f35ae7866dac5c497372b68d03309c7eae9424 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期三, 02 八月 2023 18:15:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java
index 36184a5..1e0b59b 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java
@@ -213,9 +213,9 @@
 				vo.setPkBtmType(btmType.getOid());
 				vo.setAttrDataType(VciFieldTypeEnum.VTString.name());
 				// 鐗堟湰瑙勫垯瀛楁涓嶈兘涓虹┖
-				vo.setNullableFlag(false);
+//				vo.setNullableFlag(false);
 				vo.setAttributeLength(150);
-				if (Arrays.asList("lastr","firstr","lastv","firstv","revisionseq","versionseq","revisionvalue","versionvalue").contains(id)){
+				if (Arrays.asList("lastr","firstr","lastv","firstv","revisionseq","versionseq").contains(id)){
 					vo.setAttributeLength(5);
 					vo.setAttrDataType(VciFieldTypeEnum.VTInteger.name());
 				}
@@ -234,7 +234,7 @@
 				vo.setId(id);
 				vo.setName(name);
 				vo.setPkBtmType(btmType.getOid());
-				vo.setNullableFlag(false);
+//				vo.setNullableFlag(false);
 				vo.setAttributeLength(50);
 				vo.setAttrDataType(VciFieldTypeEnum.VTString.name());
 				list.add(vo);
@@ -248,7 +248,7 @@
 				vo.setId(id);
 				vo.setName(name);
 				vo.setPkBtmType(btmType.getOid());
-				vo.setNullableFlag(false);
+//				vo.setNullableFlag(false);
 				vo.setAttributeLength(5);
 				vo.setAttrDataType(VciFieldTypeEnum.VTInteger.name());
 				list.add(vo);

--
Gitblit v1.9.3