Merge branch 'Dev-Branch' into wxr1215

wxr

2022-05-17 4c586bb23cdcae56ae4e4c62e90e148dc10b9d90

 HDL_ON/DAL/Server/NewApiRes.cs

@@ -1474,12 +1474,14 @@
        /// 扩展数据内容
        /// </summary>
        public string expantContent = "";

        /// <summary>
        /// 设备类型
        /// HDL: door.gate
        /// spk标志，值为door.gate时表示自研
        /// </summary>
        public string spk = "";
        public string spk="";
        /// <summary>
        /// sip账号
        /// </summary>
        public string sipAccount;

    }