merge: 合并最新 main 到 dev_11.15

This commit is contained in:
yml
2026-11-15 17:24:44 +08:00
35 changed files with 543 additions and 129 deletions
@@ -138,6 +138,7 @@ func (row orderRow) toAdminDTO() OrderDTO {
OfflineSettlementStatus: effectiveOfflineSettlementStatus(row.RentalOrder),
OfflineSettlementAmountCent: row.OfflineSettlementAmountCent,
OfflineSettlementRemark: row.OfflineSettlementRemark,
ActualPayoutOperator: row.ActualPayoutOperator,
OfflineSettledBy: row.OfflineSettledBy,
OfflineSettledAt: row.OfflineSettledAt,
RefundStatus: row.RefundStatus,