From 01e690854cfd45322b07f3eafb91ff875dc7af7b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 08 九月 2023 15:45:02 +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 | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 2a91389..8fa4fb1 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
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+import com.vci.ubcs.starter.revision.model.BaseModel;
import lombok.Data;
import java.util.List;
@@ -12,7 +12,7 @@
* @date 2023-04-24
*/
@Data
-public class CodeBasicSecVO extends BaseModelVO {
+public class CodeBasicSecVO extends BaseModel {
/**
* 绂佹淇敼杩欎釜鍊�
@@ -149,7 +149,6 @@
*/
private String filterSql ;
-
/**
* 娴佹按鍙疯捣濮嬪��
*/
@@ -159,7 +158,6 @@
* 娴佹按鐨勬闀�
*/
private Integer serialStep;
-
/**
* 缂栫爜琛ヤ綅鏂瑰紡
@@ -211,7 +209,6 @@
*/
private String parentClassifySecText;
-
/**
* 鏄惁鍙互涓虹┖
*/
@@ -238,6 +235,11 @@
private Integer serialDependOrder;
/**
+ * 鐮佸�肩敵璇疯〃鍗曚腑鏄剧ず闅愯棌绛夌姸鎬侊細 1(鍙緭)銆�2(鍙)銆�3(闅愯棌)
+ */
+ private Integer codeValueApplyStatus;
+
+ /**
* 鍥哄畾鐮佺殑鐮佸�煎唴瀹�
*/
private List<CodeFixedValueVO> fixedValueVOList;
--
Gitblit v1.9.3