Merge branch 'dev-tzy' into temp-wxr

wxr

2021-03-30 aa8a3dcb1cb921c9f721aac4c9c87c696ce8a354

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/EditControl.cs

@@ -9,6 +9,7 @@
    {
        public EditControl()
        {
            Tag = "PirView";
        }
        public void Show(Entity.Function control,Action<Entity.Function> action)
        {