From e3f807e115e30686760288714973a1c4d2cfd3e1 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 13 四月 2022 20:53:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 PlanM/数据导入/Gy_DataIn_RoutingBill.designer.cs |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.designer.cs" "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.designer.cs"
index 2f3f591..eb873e9 100644
--- "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.designer.cs"
+++ "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.designer.cs"
@@ -41,7 +41,7 @@
             // 
             // pPic
             // 
-            this.pPic.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.pPic.Margin = new System.Windows.Forms.Padding(5);
             this.pPic.Size = new System.Drawing.Size(1544, 56);
             // 
             // panel1
@@ -53,7 +53,7 @@
             this.panel1.Controls.Add(this.label2);
             this.panel1.Controls.Add(this.cmbHYear);
             this.panel1.Controls.Add(this.label1);
-            this.panel1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.panel1.Margin = new System.Windows.Forms.Padding(5);
             this.panel1.Size = new System.Drawing.Size(1544, 52);
             this.panel1.Controls.SetChildIndex(this.cmdHPath, 0);
             this.panel1.Controls.SetChildIndex(this.label4, 0);
@@ -75,12 +75,12 @@
             // cmdHPath
             // 
             this.cmdHPath.Location = new System.Drawing.Point(1043, 9);
-            this.cmdHPath.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.cmdHPath.Margin = new System.Windows.Forms.Padding(5);
             // 
             // txtHPath
             // 
             this.txtHPath.Location = new System.Drawing.Point(615, 4);
-            this.txtHPath.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.txtHPath.Margin = new System.Windows.Forms.Padding(5);
             this.txtHPath.Size = new System.Drawing.Size(419, 39);
             // 
             // label4
@@ -103,7 +103,7 @@
             this.cmbHYear.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbHYear.FormattingEnabled = true;
             this.cmbHYear.Location = new System.Drawing.Point(112, 10);
-            this.cmbHYear.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.cmbHYear.Margin = new System.Windows.Forms.Padding(4);
             this.cmbHYear.Name = "cmbHYear";
             this.cmbHYear.Size = new System.Drawing.Size(124, 23);
             this.cmbHYear.TabIndex = 105;
@@ -126,7 +126,7 @@
             "11",
             "12"});
             this.cmbHPeriod.Location = new System.Drawing.Point(359, 12);
-            this.cmbHPeriod.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.cmbHPeriod.Margin = new System.Windows.Forms.Padding(4);
             this.cmbHPeriod.Name = "cmbHPeriod";
             this.cmbHPeriod.Size = new System.Drawing.Size(112, 23);
             this.cmbHPeriod.TabIndex = 107;
@@ -147,9 +147,9 @@
             this.checkadd.Checked = true;
             this.checkadd.CheckState = System.Windows.Forms.CheckState.Checked;
             this.checkadd.Location = new System.Drawing.Point(1447, 12);
-            this.checkadd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.checkadd.Margin = new System.Windows.Forms.Padding(4);
             this.checkadd.Name = "checkadd";
-            this.checkadd.Size = new System.Drawing.Size(56, 19);
+            this.checkadd.Size = new System.Drawing.Size(59, 19);
             this.checkadd.TabIndex = 108;
             this.checkadd.Text = "追加";
             this.checkadd.UseVisualStyleBackColor = true;
@@ -157,7 +157,7 @@
             // txtHSheetName
             // 
             this.txtHSheetName.Location = new System.Drawing.Point(1265, 11);
-            this.txtHSheetName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtHSheetName.Margin = new System.Windows.Forms.Padding(4);
             this.txtHSheetName.Name = "txtHSheetName";
             this.txtHSheetName.Size = new System.Drawing.Size(132, 25);
             this.txtHSheetName.TabIndex = 109;
@@ -177,7 +177,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.ClientSize = new System.Drawing.Size(1544, 789);
-            this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Margin = new System.Windows.Forms.Padding(5);
             this.Name = "Gy_DataIn_RoutingBill";
             this.Text = "数据导入模块";
             this.pPic.ResumeLayout(false);

--
Gitblit v1.9.1