Merge branch 'tzy' into NewFilePath

wxr

2020-12-17 6ec12a036c96a200fc0a941967d6b4d07592f863

 HDL_ON/DAL/Server/NewApiRes.cs

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

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