Merge branch 'WJC' into temp-wxr

wxr

2021-03-25 4975f3d6beb81e3967b1018d629be9c3410b9ea3

 HDL_ON/UI/UI2/FuntionControlView/Music/View/TipView.cs

old mode 100755
new mode 100644