需要合并

gxc

2019-11-22 9c607e921ca7c379799e4dd88b140265a1d5d5c5

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs

@@ -159,8 +159,8 @@
                //如果设置有内部防区

                string msg = string.Empty;

                if (HdlSafeguardLogic.Current.IsHadInternalDefenseArea() == true)


                 {



                {

                    //在家布防设置成功

                    msg = Language.StringByID(R.MyInternationalizationString.uSetAtHomeGarrisonSuccess);

                }