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
+3 -1
View File
@@ -82,6 +82,7 @@ type OrderDTO struct {
OfflineSettlementStatus string `json:"offline_settlement_status,omitempty"`
OfflineSettlementAmountCent int64 `json:"offline_settlement_amount_cent"`
OfflineSettlementRemark string `json:"offline_settlement_remark,omitempty"`
ActualPayoutOperator string `json:"offline_settlement_actual_operator,omitempty"`
OfflineSettledBy *uint64 `json:"offline_settled_by,omitempty"`
OfflineSettledAt *time.Time `json:"offline_settled_at,omitempty"`
RefundStatus string `json:"refund_status,omitempty"`
@@ -225,7 +226,8 @@ type ForceHandoffRequest struct {
}
type OfflineSettlementRequest struct {
Remark string `json:"remark"`
ActualOperator string `json:"actual_operator" binding:"required,max=64"`
Remark string `json:"remark"`
}
type AdminOrderQuery struct {