Merge branch 'dev-tzy' into temp-wxr

wxr

2021-03-09 134811c790a982d505567e2ba69b5de566410367

 HDL_ON/Entity/Device/DeviceModule.cs

old mode 100755
new mode 100644
@@ -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";