Merge branch 'dev-tzy' into temp-wxr

wxr

2021-03-16 fab43407e01474cc4f7b1d0f4b5e43ce1a038ce4

 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";