From ac8e8998235f247365280d1a1632115c43b10037 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 17 十一月 2023 02:24:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java |   33 ++++++++++++++++++++++++++++++---
 1 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java
index debd8d1..c460723 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java
@@ -75,6 +75,11 @@
 	private String codeDateFormatStr;
 
 	/**
+	 * 鏃ユ湡鏍煎紡杞崲寰楀埌鐨勯粯璁ゅ��
+	 */
+	private String codeDateValue;
+
+	/**
 	 * 灞傜骇绫诲瀷
 	 */
 	private String codeLevelType;
@@ -149,7 +154,6 @@
 	 */
 	private String filterSql ;
 
-
 	/**
 	 * 娴佹按鍙疯捣濮嬪��
 	 */
@@ -159,7 +163,6 @@
 	 * 娴佹按鐨勬闀�
 	 */
 	private Integer serialStep;
-
 
 	/**
 	 * 缂栫爜琛ヤ綅鏂瑰紡
@@ -197,6 +200,16 @@
 	private String customCodeSerialClass;
 
 	/**
+	 * 鑷畾涔夌殑娴佹按绠楁硶绫�
+	 */
+	private String customCodeSerialClassText;
+
+	/***
+	 * 鑷畾涔夋祦姘寸被鍨�
+	 */
+	private String customCodeSerialType;
+
+	/**
 	 * 鏄惁鑷姩鍖归厤鍒嗙被鍊�
 	 */
 	private String matchClassifyValueFlag;
@@ -210,7 +223,6 @@
 	 * 鐖跺垎绫荤爜娈靛悕绉�
 	 */
 	private String parentClassifySecText;
-
 
 	/**
 	 * 鏄惁鍙互涓虹┖
@@ -238,6 +250,21 @@
 	private Integer serialDependOrder;
 
 	/**
+	 * 鍓嶇紑
+	 */
+	private String prefixCode;
+
+	/**
+	 * 鍚庣紑
+	 */
+	private String suffixCode;
+
+	/**
+	 * 鐮佸�肩敵璇疯〃鍗曚腑鏄剧ず闅愯棌绛夌姸鎬侊細 1(鍙緭)銆�2(鍙)銆�3(闅愯棌)
+	 */
+	private Integer codeValueApplyStatus;
+
+	/**
 	 * 鍥哄畾鐮佺殑鐮佸�煎唴瀹�
 	 */
 	private List<CodeFixedValueVO> fixedValueVOList;

--
Gitblit v1.9.3