Merge branch 'CJL' into NewFilePath

wxr

2020-12-21 32cd05a17e2b7ae8a1d3687996278dc25dd58cc5

 HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs

old mode 100755
new mode 100644
@@ -63,7 +63,7 @@
        /// </summary>
        void LoadEvet_ChangeFadeTime()
        {
            barFadeTime.OnProgressChangedEvent = (sender, e) =>
            barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
            {
                light.fadeTime = e;
                light.SaveFunctionData(true);