Merge branch 'Dev-Branch' into Dev-Wxr-1.8.1

wxr

2023-06-07 9c4967cd8843ac7ed65ee64195bcf69c592c4a20

 HDL_ON/DAL/Server/IMessageCommon.cs

@@ -164,6 +164,7 @@
            stateCodeDic["14007"] = StringId.ControlFailure;
            //网关离线
            stateCodeDic["14005"] = StringId.GatewayOffline;
            stateCodeDic["124005"] = StringId.GatewayOffline;
            //设备离线
            stateCodeDic["14006"] = StringId.DeviceOffline;