From 6fcfefb225083e8b557ac4d286baafa569094d54 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 28 二月 2022 16:07:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
index 777ba66..345b129 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -107,14 +107,15 @@
      *
      * @param accessToken  鎺堟潈杩囩▼鑾峰彇鐨刟ccess_token
      * @param deviceSerial 璁惧搴忓垪鍙�,瀛樺湪鑻辨枃瀛楁瘝鐨勮澶囧簭鍒楀彿锛屽瓧姣嶉渶涓哄ぇ鍐�
-     * @param validateCode 璁惧楠岃瘉鐮侊紝璁惧鏈鸿韩涓婄殑鍏綅澶у啓瀛楁瘝
+//     * @param validateCode 璁惧楠岃瘉鐮侊紝璁惧鏈鸿韩涓婄殑鍏綅澶у啓瀛楁瘝
      */
-    public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial, String validateCode) {
+//    public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial, String validateCode) {
+    public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial) {
 
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("accessToken", accessToken);
         paramMap.put("deviceSerial", deviceSerial);
-        paramMap.put("validateCode", validateCode);
+//        paramMap.put("validateCode", validateCode);
         String s = HttpUtil.post(YSY_URL + ADD_DEVICE_URL, paramMap);
         System.out.println(s);
         YSY_MonitorDto monitorDto = JSON.parseObject(s, YSY_MonitorDto.class);

--
Gitblit v1.9.3