Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-04 2f1b0d944bd8feb7c6dca5126a4832228ba826ce

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

@@ -161,7 +161,7 @@
                                        {
                                            continue;
                                        }
                                        var r = DB_ResidenceData.Rooms.Find(s => s.uid == rId);
                                        var r = DB_ResidenceData.residenceData.Rooms.Find(s => s.uid == rId);
                                        if(r == null)
                                        {
                                            continue;