Merge remote-tracking branch 'origin/newBranch1' into WJC

JLChen

2021-08-21 af9c3e0b3b1eb370e966b3ca9db3f62848d4189b

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -19,7 +19,6 @@
        /// </summary>
        public string MasterToken;

        //RegionInfoRes _residecenInfo;
        RegionInfoRes _residecenInfo = new RegionInfoRes();
        /// <summary>
        /// 住宅基础信息
@@ -163,8 +162,8 @@
        public HomeGatewayInfo HomeGateway;

        /// <summary>
        /// 0:bus网关
        /// 1:A协议网关
        /// 0:一端口
        /// 1:Link协议网关
        /// </summary>
        public int GatewayType
        {
@@ -175,7 +174,7 @@
                //#endif
                if (HomeGateway == null)
                    return -1;
                if (HomeGateway.gatewayType == "AGATEWAY")
                if (HomeGateway.gatewayType != "BUSUDPGATEWAY")
                {
                    return 1;
                }