From 6f7f3834f66b08bed7af331ce1a168d6cd89292d Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期五, 03 一月 2025 18:14:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PRMItemVO.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PRMItemVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PRMItemVO.java
index 667ea91..57ab67c 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PRMItemVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PRMItemVO.java
@@ -50,7 +50,7 @@
/**
* 寰呴�夋嫨鐨勫睘鎬у瓧娈�
*/
- private List<String> itemSelectoutFieldList=new ArrayList<>();
+ private List<String> itemSelectOutFieldList=new ArrayList<>();
/**
@@ -144,7 +144,10 @@
* 鏋氫妇鍊�
*/
private List<String> itemValueList = null;
-
+ /**
+ * 鏋氫妇鍊奸泦鍚�
+ */
+ private List<KeyValue> itemKeyValueList=new ArrayList<>();
/**
*涓�绾у弬鐓�
@@ -617,12 +620,12 @@
this.itemSeniorQueryBOS = itemSeniorQueryBOS;
}
- public List<String> getItemSelectoutFieldList() {
- return itemSelectoutFieldList;
+ public List<String> getItemSelectOutFieldList() {
+ return itemSelectOutFieldList;
}
- public void setItemSelectoutFieldList(List<String> itemSelectoutFieldList) {
- this.itemSelectoutFieldList = itemSelectoutFieldList;
+ public void setItemSelectOutFieldList(List<String> itemSelectOutFieldList) {
+ this.itemSelectOutFieldList = itemSelectOutFieldList;
}
public List<String> getItemSearchFieldList() {
@@ -631,6 +634,14 @@
public void setItemSearchFieldList(List<String> itemSearchFieldList) {
this.itemSearchFieldList = itemSearchFieldList;
+ }
+
+ public List<KeyValue> getItemKeyValueList() {
+ return itemKeyValueList;
+ }
+
+ public void setItemKeyValueList(List<KeyValue> itemKeyValueList) {
+ this.itemKeyValueList = itemKeyValueList;
}
@Override
@@ -648,7 +659,7 @@
", itemPageSize='" + itemPageSize + '\'' +
", itemImgWH='" + itemImgWH + '\'' +
", itemOutFields='" + itemOutFields + '\'' +
- ", itemSelectoutFieldList=" + itemSelectoutFieldList +
+ ", itemSelectOutFieldList=" + itemSelectOutFieldList +
", itemOutFieldList=" + itemOutFieldList +
", itemKeyFields='" + itemKeyFields + '\'' +
", itemSearchFieldList=" + itemSearchFieldList +
@@ -667,6 +678,7 @@
", itemScript='" + itemScript + '\'' +
", itemTips='" + itemTips + '\'' +
", itemValueList=" + itemValueList +
+ ", itemKeyValueList=" + itemKeyValueList +
", itemListTable='" + itemListTable + '\'' +
", itemListTxt='" + itemListTxt + '\'' +
", itemListVal='" + itemListVal + '\'' +
--
Gitblit v1.9.3