From 9872d678fc6703101d02f68b88b7519a0b6bc82c Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 05 十一月 2024 14:15:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
index 7987cef..96cd618 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
@@ -248,7 +248,7 @@
var _obj = new
{
- guid = lbGuid.Text.Trim(), //涓诲缓
+ guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
name = txt_name.Text.Trim(),
time1 = txt_begTime.Value.Date,
time2 = txt_endTime.Value.Date,
@@ -365,7 +365,7 @@
var dt = dd.rtnData.list;
txt_workshopNo.Properties.DataSource = dt;
txt_workshopNo.Properties.DisplayMember = "name"; // 鏄剧ず鐨勫垪
- txt_workshopNo.Properties.ValueMember = "itemNo"; // 瀹為檯鍊肩殑鍒�
+ txt_workshopNo.Properties.ValueMember = "workshopNo"; // 瀹為檯鍊肩殑鍒�
txt_workshopNo.Properties.TextEditStyle =
TextEditStyles.DisableTextEditor;
}
--
Gitblit v1.9.3