Merge branch 'Dev-Branch' into dev--wxr

wxr

2022-09-27 0ee75b88cfe03e46289de0de96e8ed4580c797d3

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -78,7 +78,7 @@
                                    ShowFunction.FreshAir,ShowFunction.DoorLock,
                                    ShowFunction.Panel,ShowFunction.SecurityMonitoring,
                                    ShowFunction.Sensor,ShowFunction.VideoIntercom,
                                    ShowFunction.SecurityCenter
                                    ShowFunction.SecurityCenter,ShowFunction.Acst,
                                });
                        instance.SaveResidenceData();
                        instance.residenceImage = "Classification/Room/Roombg.png";
@@ -119,7 +119,7 @@
                                    ShowFunction.FreshAir,ShowFunction.DoorLock,
                                    ShowFunction.Panel,ShowFunction.SecurityMonitoring,
                                    ShowFunction.Sensor,ShowFunction.VideoIntercom,
                                    ShowFunction.SecurityCenter
                                    ShowFunction.SecurityCenter,ShowFunction.Acst,
                                });
                        instance.SupportFacePass = false;
                        instance.SaveResidenceData();
@@ -470,6 +470,10 @@

#endregion

        /// <summary>
        /// 场景筛选时，选择的房间
        /// </summary>
        public string sceneChooseRoomId = "";


        /// <summary>