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
+1
View File
@@ -76,6 +76,7 @@ type RentalOrder struct {
OfflineSettlementStatus string `gorm:"size:16;not null;default:'none';index" json:"offline_settlement_status"`
OfflineSettlementAmountCent int64 `gorm:"not null;default:0" json:"offline_settlement_amount_cent"`
OfflineSettlementRemark string `gorm:"size:255;not null;default:''" json:"offline_settlement_remark"`
ActualPayoutOperator string `gorm:"column:offline_settlement_actual_operator;size:64;not null;default:'';index" json:"offline_settlement_actual_operator"`
OfflineSettledBy *uint64 `json:"offline_settled_by"`
OfflineSettledAt *time.Time `json:"offline_settled_at"`
RefundStatus string `gorm:"size:32;not null;default:'none';index" json:"refund_status"`