Merge remote-tracking branch 'origin/master'

CZT

2023-10-24 f27f3ea5055888f7f1c797d0fd7fb26a2013c89c

 igds-es/src/main/java/com/ld/igds/es/manager/EsManager.java

@@ -205,10 +205,10 @@
                    "执行失败：没有配置通讯协议。");
        }

        if (Constant.YN_N.equals(deviceSer.getStatus())) {
            return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
                    "执行失败：能耗分机不在线。");
        }
//        if (Constant.YN_N.equals(deviceSer.getStatus())) {
//            return new BaseResponse(OrderRespEnum.ORDER_ERROR.getCode(),
//                    "执行失败：能耗分机不在线。");
//        }

        RemoteEsService remoteEsService = remoteManager.getRemoteEsService(deviceSer.getProtocol());