解决合并冲突

chenhaozhe

2025-06-12 579d2b489f9565f6e506ddbef634d65aa20dc27e

 WorkM/报表分析/ProductionOrder_ExecutionReport.cs

@@ -338,5 +338,14 @@
            BLL.ClsBaseSelect.SetTextByDept(textDept);
        }

        private void eXCELToolStripMenuItem_Click(object sender, EventArgs e)
        {
            DBUtility.Gy_BaseFun.DataToExcel(this.Text, grdMain);
        }

        private void cSVToolStripMenuItem_Click(object sender, EventArgs e)
        {
            DBUtility.Gy_BaseFun.DataGridViewToExcel2(grdMain, this.Text, this.Text);
        }
    }
}