Merge remote-tracking branch 'origin/jpush_tst' into wxr7

wxr

2021-09-07 95a7e380db583108d9716c56fe6d298ca08f8f23

 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs

@@ -67,7 +67,11 @@
            {
                btnLocationInfoRight.MouseUpEventHandler = eventHandler;
            }
            btnLocationValues.MouseUpEventHandler = eventHandler;
            if (btnLocationValues != null)
            {
                btnLocationValues.MouseUpEventHandler = eventHandler;
            }
                
        }
    }
}