From 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 14 六月 2024 19:41:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index c7de4e1..eadb4c6 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -117,25 +117,25 @@
         return SUCCESS_TIP;
     }
 
-    public static void main(String[] args) {
+//    public static void main(String[] args) {
+////        HashMap<String, String> map = new HashMap<>();
+////        map.put("page","1");
+////        map.put("space_id","2010");
+////        // 获取门禁列表
+////        String s1 = HttpRequestUtil.getRequest
+////                ("https://try.daowepark.com/v7/user_api/general/getDevice", map);
+////        System.err.println(s1);
+//
 //        HashMap<String, String> map = new HashMap<>();
-//        map.put("page","1");
-//        map.put("space_id","2010");
+//        map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+//        map.put("space_id","1");
+//        map.put("device_id","1");
+//        map.put("region_id","2010");
 //        // 获取门禁列表
 //        String s1 = HttpRequestUtil.getRequest
 //                ("https://try.daowepark.com/v7/user_api/general/getDevice", map);
 //        System.err.println(s1);
-
-        HashMap<String, String> map = new HashMap<>();
-        map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
-        map.put("space_id","1");
-        map.put("device_id","1");
-        map.put("region_id","2010");
-        // 获取门禁列表
-        String s1 = HttpRequestUtil.getRequest
-                ("https://try.daowepark.com/v7/user_api/general/getDevice", map);
-        System.err.println(s1);
-    };
+//    };
     /**
      * 跳转到车辆管理首页
      */

--
Gitblit v1.7.1