From d8f51c40544ae278095e991ed00ec297842d4332 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期日, 29 九月 2024 11:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java
index bd70e71..95ee245 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java
@@ -238,6 +238,15 @@
 	private String customCodeSerialClass;
 
 	/**
+	 * 鑷畾涔夌殑娴佹按绠楁硶绫�
+	 */
+	private String customCodeSerialClassText;
+
+	/***
+	 * 鑷畾涔夋祦姘寸被鍨�
+	 */
+	private String customCodeSerialType;
+	/**
 	 * 鏄惁鑷姩鍖归厤鍒嗙被鍊�
 	 */
 	//@VciFieldType(VciFieldTypeEnum.VTBoolean)
@@ -281,7 +290,7 @@
 	private String displayFlag;
 
 	/**
-	 * 娴佹按渚濊禆椤哄簭
+	 * 娴佹按渚濊禆椤哄簭 TODO:鏈潵鏄敤鏉ヨ绠楁祦姘存帓搴忕殑锛屽悗闈㈠洜涓烘煇浜涘師鍥犳敼鐢╫rderNum浜�
 	 */
 	private Integer serialDependOrder;
 

--
Gitblit v1.9.3