Merge remote-tracking branch 'origin/master'

啊鑫

2024-11-05 8dfc8d054b5b14e3fcde6415dd22cedf10c09915

 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;
            }