From 4fd3a2736011c69c8729f2b28902a5cd9d09fd2b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 21 七月 2023 09:19:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/zy/crm/manager/controller/TagController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/TagController.java b/src/main/java/com/zy/crm/manager/controller/TagController.java
index 4f8b707..416c719 100644
--- a/src/main/java/com/zy/crm/manager/controller/TagController.java
+++ b/src/main/java/com/zy/crm/manager/controller/TagController.java
@@ -181,9 +181,9 @@
@PostMapping(value = "/tag/tree/auth")
@ManagerAuth
public R tree(@RequestParam(required = false, defaultValue = "") String condition) throws IOException, ClassNotFoundException {
- ArrayList<Map> tree = treeUtils.getTree(String.valueOf(getOriginTag().getId()), getHostId());
+ ArrayList<Map<String, Object>> tree = treeUtils.getTree(String.valueOf(getOriginTag().getId()), getHostId());
// 娣辨嫹璐�
- List<Map> result = ListUtils.deepCopy(tree);
+ List<Map<String, Object>> result = ListUtils.deepCopy(tree);
if (!Cools.isEmpty(condition)) {
treeUtils.remove(condition, result);
treeUtils.remove(condition, result);
--
Gitblit v1.9.1