Merge branch 'glms/feature/1.4.2-etf' into glms/feature/1.4.2

# Conflicts: # YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js
2026-06-22 13:45:25 +08:00
parent 04d3696170 9e50819070
commit a00fe3ccaa
10 changed files with 169 additions and 93 deletions
@@ -307,6 +307,7 @@ namespace YLErp.Web.Controllers
                if (EodPriceQueryService.TryGetEodPrice(valuedate.Value, code, out var eodPrice))
                {
                    price = eodPrice.GetPrice((SettlementTypeEnum)settlementType);
+                    return JsonSuccessData(price);
                }
            }