Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/GatewayBackupEnum.cs

@@ -38,16 +38,20 @@
        /// </summary>

        A干接点私有属性 = 7,

        /// <summary>

        /// 窗帘上下限位(这个东西需要在第一)

        /// </summary>

        A窗帘上下限位 = 8,

        /// <summary>

        /// 窗帘手拉控制

        /// </summary>

        A窗帘手拉控制 = 8,

        /// <summary>

        /// 窗帘上下限位

        /// </summary>

        A窗帘上下限位 = 9,

        A窗帘手拉控制 = 9,

        /// <summary>

        /// 窗帘方向

        /// </summary>

        A窗帘方向 = 10,

        /// <summary>

        /// 空调自定义模式

        /// </summary>

        A空调自定义模式 = 11

    }

}