Merge branch 'master' of ssh://192.168.5.5:29418/aps/crm

zhangqian

2023-08-11 ae6883ce426727efca4facab973d814ae66c69c2

 model/salesReturn.go

@@ -3,20 +3,19 @@
import (
   "aps_crm/pkg/mysqlx"
   "gorm.io/gorm"
   "time"
)

type (
   SalesReturn struct {
      Id                int       `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
      ClientId          int       `json:"clientId" gorm:"column:client_id;type:int;comment:客户id"`
      Number            string    `json:"number" gorm:"column:number;type:varchar(255);comment:退货单号"`
      Repository        string    `json:"repository" gorm:"column:repository;type:varchar(255);comment:仓库"`
      MemberId          int       `json:"memberId" gorm:"column:member_id;type:int;comment:负责人id"`
      ReturnDate        time.Time `json:"returnDate" gorm:"column:return_date;type:datetime;comment:退货日期"`
      SalesReturnStatus int       `json:"salesReturnStatus" gorm:"column:sales_return_status;type:int;comment:退货状态"`
      Reason            string    `json:"reason" gorm:"column:reason;type:varchar(255);comment:退货原因"`
      Products          []Product `json:"products" gorm:"many2many:salesReturn_product;"`
      Id                int         `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
      ClientId          int         `json:"clientId" gorm:"column:client_id;type:int;comment:客户id"`
      Number            string      `json:"number" gorm:"column:number;type:varchar(255);comment:退货单号"`
      Repository        string      `json:"repository" gorm:"column:repository;type:varchar(255);comment:仓库"`
      MemberId          int         `json:"memberId" gorm:"column:member_id;type:int;comment:负责人id"`
      ReturnDate        *CustomTime `json:"returnDate" gorm:"column:return_date;type:datetime;comment:退货日期"`
      SalesReturnStatus int         `json:"salesReturnStatus" gorm:"column:sales_return_status;type:int;comment:退货状态"`
      Reason            string      `json:"reason" gorm:"column:reason;type:varchar(255);comment:退货原因"`
      Products          []Product   `json:"products" gorm:"many2many:salesReturn_product;"`
   }

   SalesReturnSearch struct {
@@ -107,4 +106,4 @@
func (slf *SalesReturnSearch) SetOrder(order string) *SalesReturnSearch {
   slf.OrderBy = order
   return slf
}
}