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/dto/PRMItemDTO.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PRMItemDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PRMItemDTO.java
index 73670f7..bb149a8 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PRMItemDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PRMItemDTO.java
@@ -51,7 +51,7 @@
/**
* 寰呴�夋嫨鐨勫睘鎬у瓧娈�
*/
- private List<String> itemSelectoutFieldList=new ArrayList<>();
+ private List<String> itemSelectOutFieldList=new ArrayList<>();
/**
* 闇�瑕佷娇鐢ㄧ殑闆嗗悎
*/
@@ -141,6 +141,11 @@
* 鏋氫妇鍊�
*/
private List<String> itemValueList = null;
+ /***
+ * 鏋氫妇鍊奸泦鍚�
+ */
+ private List<KeyValue> itemKeyValueList=new ArrayList<>();
+
/**
*涓�绾у弬鐓�
*/
@@ -613,11 +618,11 @@
}
public List<String> getItemSelectoutFieldList() {
- return itemSelectoutFieldList;
+ return itemSelectOutFieldList;
}
- public void setItemSelectoutFieldList(List<String> itemSelectoutFieldList) {
- this.itemSelectoutFieldList = itemSelectoutFieldList;
+ public void setItemSelectoutFieldList(List<String> itemSelectOutFieldList) {
+ this.itemSelectOutFieldList = itemSelectOutFieldList;
}
public List<String> getItemSearchFieldList() {
@@ -695,6 +700,14 @@
// }
+ public List<KeyValue> getItemKeyValueList() {
+ return itemKeyValueList;
+ }
+
+ public void setItemKeyValueList(List<KeyValue> itemKeyValueList) {
+ this.itemKeyValueList = itemKeyValueList;
+ }
+
@Override
public String toString() {
return "PRMItemDTO{" +
@@ -710,7 +723,7 @@
", itemPageSize='" + itemPageSize + '\'' +
", itemImgWH='" + itemImgWH + '\'' +
", itemOutFields='" + itemOutFields + '\'' +
- ", itemSelectoutFieldList=" + itemSelectoutFieldList +
+ ", itemSelectOutFieldList=" + itemSelectOutFieldList +
", itemOutFieldList=" + itemOutFieldList +
", itemKeyFields='" + itemKeyFields + '\'' +
", itemSearchFieldList=" + itemSearchFieldList +
@@ -729,6 +742,7 @@
", itemScript='" + itemScript + '\'' +
", itemTips='" + itemTips + '\'' +
", itemValueList=" + itemValueList +
+ ", itemKeyValueList=" + itemKeyValueList +
", itemListTable='" + itemListTable + '\'' +
", itemListTxt='" + itemListTxt + '\'' +
", itemListVal='" + itemListVal + '\'' +
--
Gitblit v1.9.3