From 811e8e7139ad6e331c2f84bcd5cf3f927a8b3312 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 15 五月 2021 18:22:57 +0800
Subject: [PATCH] Merge https://gitee.com/wuxw7/MicroCommunity

---
 java110-utils/src/main/java/com/java110/utils/util/RuleUtil.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java110-utils/src/main/java/com/java110/utils/util/RuleUtil.java b/java110-utils/src/main/java/com/java110/utils/util/RuleUtil.java
index af084f5..6f5df74 100755
--- a/java110-utils/src/main/java/com/java110/utils/util/RuleUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/RuleUtil.java
@@ -20,13 +20,13 @@
      * @param reqJson
      * @return   濡傛灉鑾峰彇涓嶅埌鍒欎細杩斿洖new ArrayList(),涓嶄細涓簄ull
      */
-    public static List getRuleIdsInGroupByJson(String reqJson,List saopRuleGroupInfoList)
+    public static List<Object> getRuleIdsInGroupByJson(String reqJson,List<Object> saopRuleGroupInfoList)
     {
         //鑾峰彇缂撳瓨涓鍒欏垎缁勯泦鍚�
         //List saopRuleGroupInfoList = RuleUtil.getRuleGroupRelaList();
 
         //褰撳墠鍒嗙粍涓嬬殑瑙勫垯缂栫爜闆嗗悎
-        List ruleIdsInCurGroupList = new ArrayList();
+        List<Object> ruleIdsInCurGroupList = new ArrayList<Object>();
 
         try
         {

--
Gitblit v1.8.0