Merge branch 'CJL'

wxr

2020-11-20 f4b178e64fd43262872fe9d443aa9da6048ceaac

 HDL_ON/Entity/Function/Function.cs

@@ -219,8 +219,10 @@
            {
                var findRoom = DB_ResidenceData.rooms.Find(obj => obj.sid == roomId);
                if (findRoom == null)
                {
                    continue;
                if(roomNameList != "")
                }
                if (roomNameList != "")
                {
                    roomNameList += ",";
                }