Merge branch 'dev'
# Conflicts: # backend/internal/modules/payment/payment_start.go # deploy/docker-compose.dev.yml # frontend/src/features/admin/AdminPaymentsPage.tsx # scripts/dev.sh
This commit is contained in:
@@ -111,6 +111,7 @@ func (row adminPaymentRow) toDTO() AdminPaymentDTO {
|
||||
PaymentNo: row.PaymentNo,
|
||||
OrderID: row.OrderID,
|
||||
OrderNo: row.OrderNo,
|
||||
BizID: row.BizID,
|
||||
UserID: row.UserID,
|
||||
PaymentConfigID: row.PaymentConfigID,
|
||||
UserPhone: row.UserPhone,
|
||||
|
||||
Reference in New Issue
Block a user