Merge branch 'WJC' into wxr6

wxr

2021-11-05 f6c4e9886b924d8f5271e8b58378d7a07269dcb8

 HDL_ON/Common/Utlis/FloorRoomSelectPopupView.cs

@@ -251,7 +251,7 @@
                    if (roomInfo.uid == this.nowShowSelectId)

                    {

                        btnFloorName.Text = roomInfo.floorName + roomInfo.roomName;

                        btnFloorName.Width = btnFloorName.GetTextWidth();

                        //btnFloorName.Width = btnFloorName.GetTextWidth();

                        return;

                    }

                }

@@ -264,7 +264,7 @@
                    if (floorInfo.uid == this.nowShowSelectId)

                    {

                        btnFloorName.Text = floorInfo.roomName;

                        btnFloorName.Width = btnFloorName.GetTextWidth();

                        //btnFloorName.Width = btnFloorName.GetTextWidth();

                    }

                }

            }