From ab17f44cc4aa2b15c36d6f523fa3844a338101ce Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 24 十月 2023 21:31:52 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
index cb1350e..fa819e5 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
@@ -648,15 +648,24 @@
         Integer objectType = UserExt.getUser().getObjectType();
         Integer objectId = UserExt.getUser().getObjectId();
         String cityCode = null;
-        if(objectType == 2){//城市管理员
-            CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
-            cityCode = cityManager.getCityCode();
-        }
+//        if(objectType == 2){//城市管理员
+//            CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
+//            cityCode = cityManager.getCityCode();
+//        }
         System.out.println("======="+storeService.queryCity(code, cityCode));
 //        return storeService.queryCity(code, cityCode);
         return new ResultUtil(0,null,null,storeService.queryCity(code, cityCode),null);
     }
 
+    @ResponseBody
+    @PostMapping("/queryCity3")
+    public ResultUtil queryCity3(){
+
+        System.out.println("======="+storeService.queryCity1());
+//        return storeService.queryCity(code, cityCode);
+        return new ResultUtil(0,null,null,storeService.queryCity1(),null);
+    }
+
 
     @ResponseBody
     @PostMapping("/queryCity1/")

--
Gitblit v1.7.1