Merge branch 'master' into NewFilePath

wei

2020-12-16 227bd88c1c8e41366c4bbffc54ee2b1fcbe35065

 HDL_ON/DAL/Server/NewApiRes.cs

@@ -569,24 +569,7 @@
        /// ON_LINE(0,"在线"),
        /// OFF_LINE(1,"下线"),;
        /// </summary>
        public string gatewayStatus;
        /// <summary>
        /// 网关是否在线
        /// </summary>
        public bool GatewayOnline
        {
            get
            {
                if (gatewayStatus == "ON_LINE")
                {
                    return true;
                }
                else
                {
                    return false;
                }
            }
        }
        public bool gatewayStatus;

        ///// <summary>
        /////