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-base/src/main/java/com/vci/starter/web/pagemodel/BaseResult.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseResult.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseResult.java
index b16511e..d0c8185 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseResult.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseResult.java
@@ -90,7 +90,7 @@
/**
* 鏍戠殑鏁版嵁
*/
- private Collection<Tree> treeData;
+ private Collection<BaseTree> treeData;
public Object[] getMsgObjs() {
return msgObjs;
@@ -196,11 +196,11 @@
this.data = data;
}
- public Collection<Tree> getTreeData() {
+ public Collection<BaseTree> getTreeData() {
return treeData;
}
- public void setTreeData(Collection<Tree> treeData) {
+ public void setTreeData(Collection<BaseTree> treeData) {
this.treeData = treeData;
}
@@ -411,7 +411,7 @@
* @param treeList 鏍戣妭鐐归泦鍚�
* @return 缁熶竴鏁版嵁瀵硅薄
*/
- public static BaseResult tree(Collection<Tree> treeList){
+ public static BaseResult tree(Collection<? extends BaseTree> treeList){
BaseResult baseResult = new BaseResult<>();
baseResult.setCode(ResultCodeEnum.SUCCESS.code);
baseResult.setSuccess(true);
--
Gitblit v1.9.3