From e973fb747f0d1a382fb9e4cdb20383a0a546ef67 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 03 十二月 2024 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIDataGridQuery.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UIDataGridQuery.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIDataGridQuery.java
similarity index 92%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UIDataGridQuery.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIDataGridQuery.java
index 57fea20..b6a2dcd 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UIDataGridQuery.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIDataGridQuery.java
@@ -1,4 +1,4 @@
-package com.vci.web.query;
+package com.vci.query;
import com.vci.starter.web.pagemodel.BaseQueryObject;
@@ -42,7 +42,7 @@
/**
* 鏉ユ簮鏁版嵁
*/
- private Map<String,String> sourceData = new HashMap<>();
+ private Map<String,Object> sourceData = new HashMap<>();
/**
* 閫夋嫨鏁版嵁
@@ -54,11 +54,11 @@
*/
private boolean treeTableFlag = false;
- public Map<String, String> getSourceData() {
+ public Map<String, Object> getSourceData() {
return sourceData;
}
- public void setSourceData(Map<String, String> sourceData) {
+ public void setSourceData(Map<String, Object> sourceData) {
this.sourceData = sourceData;
}
--
Gitblit v1.9.3