From 46ad19a20591681dde550c1020389ea66d58f425 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 25 十一月 2024 16:46:19 +0800
Subject: [PATCH] 密码策略必填种类默认选中组合方式为1种&&UI上下文切换Tab栏表格高度不一致问题
---
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java | 82 ++++++++++++++++++++++++++++++-----------
1 files changed, 60 insertions(+), 22 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java
index 5283769..8ba5e9e 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java
@@ -1,5 +1,7 @@
package com.vci.pagemodel;
+import com.vci.starter.web.pagemodel.Tree;
+
import java.util.Date;
import java.util.List;
@@ -36,6 +38,11 @@
private String tableName;
/**
+ * 鐖朵笟鍔$被鍨�
+ */
+ private String fName;
+
+ /**
* 鎻忚堪
*/
private String description;
@@ -51,11 +58,6 @@
private String revisionRuleName;
/**
- * 鍒嗛殧绗�
- */
- private String revisionSep;
-
- /**
* 鏄惁鎵嬪姩杈撳叆鐗堟湰
*/
private boolean inputRevisionFlag;
@@ -85,7 +87,6 @@
*/
private boolean secretFlag;
-
/**
* 瀹炰緥鍖栫被
*/
@@ -96,7 +97,6 @@
*/
private String shape;
-
/**
* 鐢熷懡鍛ㄦ湡鐨勮嫳鏂囧悕绉�
*/
@@ -112,11 +112,15 @@
*/
private String versionRule;
+ /**
+ * 鐗堟湰绾у埆
+ */
+ private short revLevel;
/**
* 澶囩敤鐢熷懡鍛ㄦ湡鑻辨枃鍚嶇О
*/
- private String subLifeCycleId;
+ private String lifeCycleIds;
/**
* 澶囩敤鐢熷懡鍛ㄦ湡涓枃鍚嶇О
@@ -134,6 +138,11 @@
private String viewCreateSql;
/**
+ * 鍒嗛殧绗�
+ */
+ private String delimiter;
+
+ /**
* 涓氬姟绫诲瀷鍚嶇О
*/
private String btmname;
@@ -169,10 +178,47 @@
private Date ts;
/**
+ * 鍖呭惈灞炴�у悕绉�
+ */
+ private String[] apNameArray;
+
+ /**
* 鍖呭惈灞炴��
*/
private List<OsBtmTypeAttributeVO> attributes;
+ public void setApNameArray(String[] apNameArray) {
+ this.apNameArray = apNameArray;
+ }
+
+ public String[] getApNameArray() {
+ return apNameArray;
+ }
+
+ public void setfName(String fName) {
+ this.fName = fName;
+ }
+
+ public String getfName() {
+ return fName;
+ }
+
+ public void setDelimiter(String delimiter) {
+ this.delimiter = delimiter;
+ }
+
+ public String getDelimiter() {
+ return delimiter;
+ }
+
+ public void setRevLevel(short revLevel) {
+ this.revLevel = revLevel;
+ }
+
+ public short getRevLevel() {
+ return revLevel;
+ }
+
public String getOid() {
return oid;
}
@@ -221,14 +267,6 @@
this.revisionRuleName = revisionRuleName;
}
- public String getRevisionSep() {
- return revisionSep;
- }
-
- public void setRevisionSep(String revisionSep) {
- this.revisionSep = revisionSep;
- }
-
public boolean isInputRevisionFlag() {
return inputRevisionFlag;
}
@@ -374,12 +412,12 @@
this.lifeCycleName = lifeCycleName;
}
- public String getSubLifeCycleId() {
- return subLifeCycleId;
+ public String getLifeCycleIds() {
+ return lifeCycleIds;
}
- public void setSubLifeCycleId(String subLifeCycleId) {
- this.subLifeCycleId = subLifeCycleId;
+ public void setLifeCycleIds(String lifeCycleIds) {
+ this.lifeCycleIds = lifeCycleIds;
}
public String getSubLifeCycleName() {
@@ -432,7 +470,7 @@
", description='" + description + '\'' +
", revisionRuleId='" + revisionRuleId + '\'' +
", revisionRuleName='" + revisionRuleName + '\'' +
- ", revisionSep='" + revisionSep + '\'' +
+ ", delimiter='" + delimiter + '\'' +
", inputRevisionFlag=" + inputRevisionFlag +
", revisionRuleVO=" + revisionRuleVO +
", abstractFlag=" + abstractFlag +
@@ -444,7 +482,7 @@
", lifeCycleId='" + lifeCycleId + '\'' +
", lifeCycleName='" + lifeCycleName + '\'' +
", versionRule='" + versionRule + '\'' +
- ", subLifeCycleId='" + subLifeCycleId + '\'' +
+ ", lifeCycleIds='" + lifeCycleIds + '\'' +
", subLifeCycleName='" + subLifeCycleName + '\'' +
", viewFlag=" + viewFlag +
", viewCreateSql='" + viewCreateSql + '\'' +
--
Gitblit v1.10.0