From deb9457cbf67185699de2cd6dbc1ec5690584da0 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 06 九月 2024 12:30:41 +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 |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 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..24ffb05 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
@@ -127,7 +127,10 @@
      * 鏋氫妇鍊�
      */
     private List<String> itemValueList = null;
-
+    /***
+     * 鏋氫妇鍊奸泦鍚�
+     */
+    private List<KeyValue> itemKeyValueList=new ArrayList<>();
     /**
      *涓�绾у弬鐓�
      */
@@ -664,6 +667,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 +705,7 @@
                 ", itemScript='" + itemScript + '\'' +
                 ", itemTips='" + itemTips + '\'' +
                 ", itemValueList=" + itemValueList +
+                ", itemKeyValueList=" + itemKeyValueList +
                 ", itemListTable='" + itemListTable + '\'' +
                 ", itemListTxt='" + itemListTxt + '\'' +
                 ", itemListVal='" + itemListVal + '\'' +

--
Gitblit v1.9.3