From 65253da4cbb0ff0dd4a4d69b8b36360e48428398 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 06 五月 2022 10:58:54 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 BaseSet/公用资料/其他基础资料/Gy_StdWorkTimesList.Designer.cs |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.Designer.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.Designer.cs"
index c4312df..2f5305c 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.Designer.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.Designer.cs"
@@ -31,7 +31,7 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_StdWorkTimesList));
-            System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("椤圭洰");
+            System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("椤圭洰");
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.grdMain = new System.Windows.Forms.DataGridView();
             this.fsh = new System.Windows.Forms.ToolStripButton();
@@ -188,13 +188,13 @@
             this.tv.Location = new System.Drawing.Point(0, 24);
             this.tv.Margin = new System.Windows.Forms.Padding(4);
             this.tv.Name = "tv";
-            treeNode2.ForeColor = System.Drawing.Color.Black;
-            treeNode2.Name = "tjbb";
-            treeNode2.NodeFont = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            treeNode2.StateImageKey = "鏂囦欢澶�1.ico";
-            treeNode2.Text = "椤圭洰";
+            treeNode1.ForeColor = System.Drawing.Color.Black;
+            treeNode1.Name = "tjbb";
+            treeNode1.NodeFont = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            treeNode1.StateImageKey = "鏂囦欢澶�1.ico";
+            treeNode1.Text = "椤圭洰";
             this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
-            treeNode2});
+            treeNode1});
             this.tv.SelectedImageIndex = 1;
             this.tv.Size = new System.Drawing.Size(195, 595);
             this.tv.TabIndex = 16;
@@ -259,9 +259,9 @@
             this.ToolBar.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
             this.ToolBar.ImageScalingSize = new System.Drawing.Size(22, 22);
             this.ToolBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripSeparator6,
             this.gs,
             this.wl,
+            this.toolStripSeparator6,
             this.xz,
             this.xg,
             this.sc,
@@ -277,10 +277,10 @@
             this.sh,
             this.fsh,
             this.toolStripSeparator3,
-            this.tc,
-            this.toolStripSeparator5,
             this.jy,
-            this.fjy});
+            this.fjy,
+            this.toolStripSeparator5,
+            this.tc});
             this.ToolBar.Location = new System.Drawing.Point(0, 0);
             this.ToolBar.Name = "ToolBar";
             this.ToolBar.Padding = new System.Windows.Forms.Padding(0);

--
Gitblit v1.9.1