From 7c3b084053ad10f7d5ecc82795f78c92452dbe2e Mon Sep 17 00:00:00 2001
From: lsm <zlysdm@163.com>
Date: Tue, 27 Aug 2024 12:52:35 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=BA=8F=E5=8F=B7=E5=88=97=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs
index 57e8eb8..a4df6d1 100644
--- a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs
+++ b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs
@@ -561,11 +561,7 @@
             this.gridColumn21});
             this.DgvOrg.FixedLineWidth = 1;
             this.DgvOrg.GridControl = this.DgcOrg;
-<<<<<<< HEAD
-            this.DgvOrg.IndicatorWidth = 40;
-=======
             this.DgvOrg.IndicatorWidth = 50;
->>>>>>> eb90ebe (1、团体快捷导出，2、编辑信息可以修改出生日期、婚况)
             this.DgvOrg.Name = "DgvOrg";
             this.DgvOrg.OptionsMenu.EnableColumnMenu = false;
             this.DgvOrg.OptionsSelection.MultiSelect = true;