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

backend/internal/modules/payment/presenter.go

@@ -19,6 +19,7 @@ func toDTO(payment model.PaymentOrder) PaymentDTO {
 		PaymentNo:       payment.PaymentNo,
 		OrderID:         payment.OrderID,
 		OrderNo:         payment.OrderNo,
+		BizID:           payment.BizID,
 		PaymentConfigID: payment.PaymentConfigID,
 		Provider:        payment.Provider,
 		ThirdOrderID:    payment.ThirdOrderID,
@@ -26,6 +27,7 @@ func toDTO(payment model.PaymentOrder) PaymentDTO {
 		PayWay:          payment.PayWay,
 		JSPayFlag:       payment.JSPayFlag,
 		AmountCent:      payment.AmountCent,
+		BizType:         payment.BizType,
 		Status:          payment.Status,
 		TDCode:          payment.TDCode,
 		JSPayURL:        payment.JSPayURL,