From 18d1f4bc4f4f77c8883702a00896dd99469db648 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 八月 2023 16:06:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-interface/src/main/java/com/java110/intf/community/IMenuInnerServiceSMO.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/java110-interface/src/main/java/com/java110/intf/community/IMenuInnerServiceSMO.java b/java110-interface/src/main/java/com/java110/intf/community/IMenuInnerServiceSMO.java
index ad6b727..9d6928a 100755
--- a/java110-interface/src/main/java/com/java110/intf/community/IMenuInnerServiceSMO.java
+++ b/java110-interface/src/main/java/com/java110/intf/community/IMenuInnerServiceSMO.java
@@ -1,11 +1,10 @@
 package com.java110.intf.community;
 
-import com.alibaba.fastjson.JSONObject;
 import com.java110.config.feign.FeignConfiguration;
-import com.java110.dto.basePrivilege.BasePrivilegeDto;
-import com.java110.dto.basePrivilege.HasPrivilegeDto;
+import com.java110.dto.privilege.BasePrivilegeDto;
+import com.java110.dto.privilege.HasPrivilegeDto;
 import com.java110.dto.menu.MenuDto;
-import com.java110.dto.menuGroup.MenuGroupDto;
+import com.java110.dto.menu.MenuGroupDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,7 +21,7 @@
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-@FeignClient(name = "${java110.community-service}", configuration = {FeignConfiguration.class})
+@FeignClient(name = "community-service", configuration = {FeignConfiguration.class})
 @RequestMapping("/menuApi")
 public interface IMenuInnerServiceSMO {
 
@@ -74,6 +73,18 @@
 
 
 
+
+
+    /**
+     * 鏌ヨ<p>灏忓尯妤�</p>鎬昏褰曟暟
+     *
+     * @param routeDto 鏁版嵁瀵硅薄鍒嗕韩
+     * @return 灏忓尯涓嬬殑灏忓尯妤艰褰曟暟
+     */
+    @RequestMapping(value = "/checkUserHasResource", method = RequestMethod.POST)
+    List<Map> checkUserHasResource(@RequestBody BasePrivilegeDto routeDto);
+
+
     /**
      * <p>鏌ヨ灏忓尯妤间俊鎭�</p>
      *
@@ -91,17 +102,6 @@
      */
     @RequestMapping(value = "/queryBasePrivilegesCount", method = RequestMethod.POST)
     int queryBasePrivilegesCount(@RequestBody BasePrivilegeDto routeDto);
-
-
-    /**
-     * 鏌ヨ<p>灏忓尯妤�</p>鎬昏褰曟暟
-     *
-     * @param routeDto 鏁版嵁瀵硅薄鍒嗕韩
-     * @return 灏忓尯涓嬬殑灏忓尯妤艰褰曟暟
-     */
-    @RequestMapping(value = "/checkUserHasResource", method = RequestMethod.POST)
-    List<Map> checkUserHasResource(@RequestBody BasePrivilegeDto routeDto);
-
 
     /**
      * <p>淇敼APP淇℃伅</p>

--
Gitblit v1.8.0