Merge branch 'CJL' into NewFilePath

wxr

2020-12-15 dbf79099f47d5f06223edfd5b8dc06c51b1830aa

 HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs

@@ -155,7 +155,7 @@
        {
            btnAddSceneBg.MouseUpEventHandler = (sender, e) =>
            {
                if (DB_ResidenceData.residenceData.CheckWhetherGatewayIdIsNull())
                if (DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
                {
                    new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.UnableToCreateScenarioPleaseBindGateway), true);
                    return;