Merge branch 'WJC' into wxr6

wxr

2021-11-18 a7885a24a152a164d7e26b12098ab92a0e272f24

 HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs

@@ -72,12 +72,12 @@
            if (isAdd)
            {
                function.roomIds.Add(room.roomId);
                room.AddRoomFunction(function);
                //room.AddRoomFunction(function);
            }
            else
            {
                function.roomIds.Remove(room.roomId);
                room.RemoveRoomFunction(function);
                //room.RemoveRoomFunction(function);
            }
            function.UpdataRoomIds();
            if (function.roomIds.Count == Entity.SpatialInfo.CurrentSpatial.RoomList.Count)