From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-account/src/main/java/com/dsh/account/controller/CityManagerController.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/CityManagerController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/CityManagerController.java
index 28f0007..b9d88ca 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/CityManagerController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/CityManagerController.java
@@ -2,8 +2,10 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dsh.account.entity.CityManager;
+import com.dsh.account.entity.TStoreStaff;
 import com.dsh.account.feignclient.other.model.Store;
 import com.dsh.account.service.ICityManagerService;
+import com.dsh.account.service.TStoreStaffService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,7 +26,8 @@
 
     @Resource
     private ICityManagerService cityManagerService;
-
+    @Autowired
+    private TStoreStaffService storeStaffService;
 
     /**
      * 根据管理员id获取详情信息
@@ -36,8 +39,8 @@
     /**
      * 获取已有城市管理的省、市
      */
+    @ResponseBody
     @RequestMapping("/cityManager/listAll")
-
     public List<CityManager> listAll(){
         return cityManagerService.listAll();
     }
@@ -79,4 +82,5 @@
     public CityManager queryCityManagerById(@RequestBody Integer id){
         return cityManagerService.getById(id);
     }
+
 }

--
Gitblit v1.7.1