Merge branch 'CJL' into wxr4

wxr

2021-05-12 9acd3887f1f8db40d59f991b1726a61aa7c7637c

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