Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy

tzy

2021-03-26 0c1e29166e6b188939c092d16f87ce2a27662c5f

 HDL_ON/Entity/Device/DeviceModule.cs

@@ -22,7 +22,7 @@
        /// 网关目前为“”
        /// 语音面板:4
        /// </summary>
        public int gateway_type = 0;
        public string gateway_type = "";
        public string model_id = "";
        public string device_name = "hdl_bus_gatway";
        public string ip_address = "172.16.2.202";