Merge remote-tracking branch 'origin/master'

wangpengfei

2023-08-15 2387b4051c095af26f158500596d21167955f971

 model/request/salesReturn.go

@@ -17,7 +17,7 @@
   Repository          string                         `json:"repository" gorm:"column:repository;type:varchar(255);comment:仓库"`
   MemberId            int                            `json:"memberId" gorm:"column:member_id;type:int;comment:负责人id"`
   ReturnDate          string                         `json:"returnDate" gorm:"column:return_date;type:datetime(3);comment:退货日期"`          //退货日期
   SalesReturnStatusId int                            `json:"salesReturnStatusId" gorm:"column:sales_return_status;type:int;comment:退货状态"` //退货状态id
   SalesReturnStatusId int                            `json:"salesReturnStatusId" gorm:"column:sales_return_status_id;type:int;comment:退货状态"` //退货状态id
   CreatorId           int                            `json:"-" gorm:"column:creator_id;type:int;comment:创建人id"`                           //创建人ID
   Creator             User                           `json:"-"  gorm:"foreignKey:CreatorId"`                                              //创建人信息
   Reason              string                         `json:"reason" gorm:"column:reason;type:varchar(255);comment:退货原因"`                  //退货原因
@@ -32,4 +32,5 @@
type GetSalesReturnList struct {
   PageInfo
   Keyword string `json:"keyword"`
   KeywordType constvar.SalesReturnKeywordType
}