From a72d939b5cafd1d02b3cae75975f1959fd0f814a Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 27 七月 2022 08:46:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WarM/条码打印/Gy_BarCodeBill.designer.cs |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
index a585688..e4a90dc 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
@@ -139,9 +139,9 @@
             this.toolStripSeparator2,
             this.AddRow,
             this.spRow,
+            this.bc,
             this.DelRow,
             this.toolStripSeparator4,
-            this.bc,
             this.toolStripSeparator8,
             this.wxm,
             this.toolStripSeparator9,
@@ -191,8 +191,8 @@
             this.sdy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.sdy.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.sdy.Name = "sdy";
-            this.sdy.Size = new System.Drawing.Size(50, 47);
-            this.sdy.Text = "璇曟墦鍗�";
+            this.sdy.Size = new System.Drawing.Size(35, 47);
+            this.sdy.Text = "娴忚";
             this.sdy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             this.sdy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
             this.sdy.Click += new System.EventHandler(this.sdy_Click);
@@ -536,7 +536,7 @@
             // 
             this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
             this.dtpHDate.Location = new System.Drawing.Point(676, 17);
-            this.dtpHDate.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.dtpHDate.Margin = new System.Windows.Forms.Padding(2);
             this.dtpHDate.Name = "dtpHDate";
             this.dtpHDate.Size = new System.Drawing.Size(188, 21);
             this.dtpHDate.TabIndex = 96;
@@ -969,7 +969,7 @@
             this.tabPage1.Controls.Add(this.grdMain);
             this.tabPage1.Location = new System.Drawing.Point(4, 22);
             this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
             this.tabPage1.Size = new System.Drawing.Size(929, 274);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "鐗╂枡淇℃伅";
@@ -980,7 +980,7 @@
             this.tabPage2.Controls.Add(this.grdSub);
             this.tabPage2.Location = new System.Drawing.Point(4, 22);
             this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
             this.tabPage2.Size = new System.Drawing.Size(929, 274);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "鏉$爜淇℃伅";

--
Gitblit v1.9.1