Merge branch 'WJC' into wxr7

wxr

2021-08-21 264f86c363a6a019fac8eb138877fee9e4734e2d

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

@@ -702,6 +702,9 @@
                        break;
                    case ShowFunction.Music:
                        functionCount = FunctionList.List.GetMusicList().Count;
#if DEBUG
                        functionCount = 1;
#endif
                        break;
                    case ShowFunction.Panel:
                        break;
@@ -722,9 +725,10 @@
                        break;
                    case ShowFunction.SecurityCenter:
                        functionCount = FunctionList.List.securities.Count;
#if DEBUG
                        functionCount = 1;
#endif
                        //if (DB_ResidenceData.Instance.GatewayType == 1)
                        //{
                        //    functionCount = 1;
                        //}
                        break;

                }