Merge branch 'WJC' into wxr6

wxr

2021-06-09 34cac3d14e5243c2388b54da02f5aebeec555da8

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/LogicAddView.cs

@@ -19,8 +19,8 @@
        /// </summary>
        public Button btnAddIcon= new Button
        {
            Width = Application.GetMinRealAverage(20),
            Height = Application.GetMinRealAverage(20),
            Width = Application.GetRealWidth(20),
            Height = Application.GetRealWidth(20),
            UnSelectedImagePath = "LogicIcon/addconditiontarget.png",
            Y = Application.GetRealHeight(22),
            X = Application.GetRealWidth(162),