From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/PRMItemDO.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/PRMItemDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/PRMItemDO.java
index c758bb8..4a41dd5 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/PRMItemDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/PRMItemDO.java
@@ -1,6 +1,5 @@
package com.vci.model;
-import com.vci.bo.ItemSeniorQueryBO;
import com.vci.pagemodel.KeyValue;
import java.util.ArrayList;
@@ -127,7 +126,10 @@
* 鏋氫妇鍊�
*/
private List<String> itemValueList = null;
-
+ /***
+ * 鏋氫妇鍊奸泦鍚�
+ */
+ private List<KeyValue> itemKeyValueList=new ArrayList<>();
/**
*涓�绾у弬鐓�
*/
@@ -160,11 +162,11 @@
/**
* 鏌ヨ妯℃澘鍚嶇О
*/
- private String itemQtName = "";
+ private String itemQtName = "0";
/**
* 鏄惁蹇呭～ 0:鍚︼紝1锛氭槸
*/
- private String itemIsRequired = "";
+ private String itemIsRequired = "0";
/**
*http瀛樺偍寮�鍏� 0锛氬惁锛�1锛氭槸
*/
@@ -664,6 +666,15 @@
public void setItemDateFormat(String itemDateFormat) {
this.itemDateFormat = itemDateFormat;
}
+
+ public List<KeyValue> getItemKeyValueList() {
+ return itemKeyValueList;
+ }
+
+ public void setItemKeyValueList(List<KeyValue> itemKeyValueList) {
+ this.itemKeyValueList = itemKeyValueList;
+ }
+
@Override
public String toString() {
return "PRMItemDO{" +
@@ -693,6 +704,7 @@
", itemScript='" + itemScript + '\'' +
", itemTips='" + itemTips + '\'' +
", itemValueList=" + itemValueList +
+ ", itemKeyValueList=" + itemKeyValueList +
", itemListTable='" + itemListTable + '\'' +
", itemListTxt='" + itemListTxt + '\'' +
", itemListVal='" + itemListVal + '\'' +
--
Gitblit v1.9.3