Merge branch 'WJC' into NewFilePath

wxr

2020-12-17 1b42f39e34492ba8d4ce6336cc913877b9e064cb

 HDL_ON/UI/UI2/2-Classification/RoomPageBLL.cs

@@ -35,7 +35,6 @@
                ReloadRoomName();
            };

            
            Action delAction = () => {
                this.RemoveFromParent();
                deleteAction?.Invoke();