Merge remote-tracking branch 'origin/newBranch1' into WJC

JLChen

2021-08-21 af9c3e0b3b1eb370e966b3ca9db3f62848d4189b

 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs

@@ -104,7 +104,6 @@
                        {
                            GetEditState(device, index, view.btnState, null, null, null);
                        }

                    }
                    break;
                //干接点