Merge branch 'glms/feature/1.4.2' into glms/feature/dotnumber

This commit is contained in:
张名锐
2026-08-03 15:11:38 +08:00
5 changed files with 2 additions and 1 deletions
@@ -153,9 +153,10 @@ namespace YLErp.Plugins.GuoLian.DocumentGenerator
// 交易日期相关
dic["成交日期"] = trade.TradeDate?.ToString("【yyyy】年【M】月【d】日");
dic["成交日期/"] = trade.TradeDate?.ToString("yyyy/M/d");
dic["开始日期"] = trade.StartDate?.ToString("【yyyy】年【M】月【d】日");
dic["到期日期"] = trade.ExerciseDate?.ToString("【yyyy】年【M】月【d】日");
// 根据交易类型填充不同数据
switch (trade.TradeType)
{