Merge remote-tracking branch 'origin/master'

啊鑫

2024-11-22 a985c4d4b80fbf3eb4abbe385adcd0536fd29eda

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs

@@ -161,7 +161,7 @@
        {
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_name, gridView1);
                lbGuid, txt_name, gridView1, "name");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");