Merge branch 'dev-tzy' into NewFilePath

wxr

2021-02-01 1dade03e0e71076af3a3de1bf10ba6cad61ac216

 HDL_ON/Entity/Device/DeviceModule.cs

@@ -14,6 +14,10 @@
        /// </summary>
        public string device_mac = "0281B9078C000000";
        /// <summary>
        /// 网关ID
        /// </summary>
        public string gatewayId = "";
        /// <summary>
        /// 设备类型
        /// 网关目前为“”
        /// 语音面板:4
@@ -26,8 +30,6 @@
        public string access_mode = "LAN";
        public string oid = "";
        public string device_model = "HDL-MGWIP.430";

        public string gatewayId = "";
        /// <summary>
        /// 设备子网号设备号，
        /// FFFF