2021-02-05 1.编译冲突修改

JLChen

2021-02-05 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a

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

old mode 100755
new mode 100644
@@ -106,7 +106,7 @@
                        try
                        {
                            //发送删除逻辑命令；
                            responsePackNew = Send.delLogic(Logic.currlogic);
                            responsePackNew = Send.DelLogic(Logic.currlogic);

                        }
                        catch { }
@@ -122,6 +122,10 @@
                                    MainView.MainShow();
                                    //发送删除逻辑命令；
                                }
                                else if (responsePackNew != null && responsePackNew.Code == "14005")
                                {
                                    new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.gatewayNotOnline));
                                }
                                else
                                {
                                    new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.delFail));