From 2c53a4e2c7ededc1f07324d797430e8d4a0607a1 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 15 八月 2023 20:33:41 +0800
Subject: [PATCH] merge
---
model/request/salesRefund.go | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/model/request/salesRefund.go b/model/request/salesRefund.go
index bc31ee5..d8fd5b5 100644
--- a/model/request/salesRefund.go
+++ b/model/request/salesRefund.go
@@ -18,7 +18,7 @@
RefundDate string `json:"refundDate"`
PaymentTypeId int `gorm:"column:payment_type_id;type:int;not null;default 0;comment:鏀舵鏂瑰紡ID" json:"paymentTypeId"` // 鏀舵鏂瑰紡ID
BankAccountId int `gorm:"column:bank_account_id;type:int;not null;default 0;comment:璐︽埛id" json:"bankAccountId"` // 璐︽埛id
- IsInvoice int `json:"isInvoice"`
+ IsInvoice string `json:"isInvoice"`
Reason string `json:"reason"`
Products []*model.Product `json:"products"`
}
@@ -30,5 +30,6 @@
type GetSalesRefundList struct {
PageInfo
- Keyword string `json:"keyword"`
+ Keyword string `json:"keyword"`
+ KeywordType constvar.SalesRefundKeywordType
}
--
Gitblit v1.8.0