Merge branch 'dev-tzy' into wxr6

wxr

2021-06-09 5bfb959c47017825c8cf7dc8570c55b04dab694c

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

@@ -493,7 +493,6 @@
                        functionOnCount = Music.A31MusicModel.A31MusicModelList.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                        if(functionCount == 0)
                        {
                            if(MainPage.InternetStatus == 2)
                            functionCount = FunctionList.List.GetMusicList().Count;
                        }
                        break;