From 2bc7800e9f02fed6652f6b0defe1d978f186e914 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期一, 12 八月 2024 09:18:34 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Organize.Core/02-Employee/EmployeeMgrMainPanel.Designer.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Organize.Core/02-Employee/EmployeeMgrMainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Organize.Core/02-Employee/EmployeeMgrMainPanel.Designer.cs
index b87c441..7933c9b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Organize.Core/02-Employee/EmployeeMgrMainPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Organize.Core/02-Employee/EmployeeMgrMainPanel.Designer.cs
@@ -218,7 +218,7 @@
colStaffStatus.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
colStaffStatus.AppearanceHeader.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
colStaffStatus.Caption = "宸ヤ綔鐘舵��";
- colStaffStatus.FieldName = "StaffStatusLabel";
+ colStaffStatus.FieldName = "StaffStatus";
colStaffStatus.Name = "colStaffStatus";
colStaffStatus.OptionsColumn.AllowEdit = false;
colStaffStatus.Visible = true;
--
Gitblit v1.9.3