Merge branch 'wxr-2.1' of http://172.16.1.23:6688/r/~wxr/OnPro into wxr-2.1

wxr

2023-08-03 a593865206070ec322ff04b7a466b4d8de4521f1

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

@@ -271,7 +271,7 @@
                            {
                                continue;
                            }
                            if (function.spk == SPK.LightRGBW || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
                            if (function.spk == SPK.LightCCT || function.spk == SPK.LightRGBW || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
                            {
                                var functionDiv = new FunctionControlZone(function,null)
                                {