From f81b7065a40d1f9428d204b3bd6bcd126f306a19 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 10 八月 2022 17:04:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/AtmosphereModifiedDataReqInnerFrame.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/AtmosphereModifiedDataReqInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/AtmosphereModifiedDataReqInnerFrame.java
index c37c8a4..690a160 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/AtmosphereModifiedDataReqInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/AtmosphereModifiedDataReqInnerFrame.java
@@ -1,5 +1,6 @@
 package com.sandu.ximon.admin.manager.iot.frame.inner.request;
 
+import com.sandu.common.execption.BusinessException;
 import com.sandu.ximon.admin.manager.iot.frame.inner.IRequestInnerFrame;
 import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
 import com.sandu.ximon.admin.manager.iot.rrpc.enums.MQTTConnectTypeEnum;
@@ -84,11 +85,10 @@
                 functionCode = AtmoFunctionCode.Setting_Data_Correction_windDirection.getCode();
                 //TODO
                 break;
-            //璁剧疆鏁版嵁淇鍊�-椋庡姏
-            case "椋庡姏":
-                functionCode = AtmoFunctionCode.Setting_Data_Correction_windPower.getCode();
-                //TODO
-                break;
+//            //璁剧疆鏁版嵁淇鍊�-椋庡姏
+//            case "椋庡姏":
+//                functionCode = AtmoFunctionCode.Setting_Data_Correction_windPower.getCode();
+//                throw new BusinessException("椋庡姏涓嶉渶瑕佽缃暟鎹慨姝e�硷紒");
             //璁剧疆鏁版嵁淇鍊�-姘斿帇
             case "姘斿帇":
                 functionCode = AtmoFunctionCode.Setting_Data_Correction_airPressure.getCode();

--
Gitblit v1.9.3