From 67c554b33cc0550929b6ec4855c52e7ca374ccee Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 13 八月 2023 14:41:30 +0800
Subject: [PATCH] 完善商品退货单

---
 model/salesDetails.go |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/model/salesDetails.go b/model/salesDetails.go
index 25211e3..be63cf7 100644
--- a/model/salesDetails.go
+++ b/model/salesDetails.go
@@ -20,6 +20,7 @@
 		SaleType            int               `json:"saleType" gorm:"column:sale_type;type:int;comment:閿�鍞被鍨�"`
 		SignTime            string            `json:"signTime" gorm:"column:sign_time;type:varchar(255);comment:绛惧崟鏃堕棿"`
 		MemberId            int               `json:"memberId" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"`
+		Member              User              `json:"Member"  gorm:"foreignKey:MemberId"`
 		DeliveryDate        string            `json:"deliveryDate" gorm:"column:delivery_date;type:varchar(255);comment:浜よ揣鏃ユ湡"`
 		WechatOrderStatusId int               `json:"wechatOrderStatusId" gorm:"column:wechat_order_status;type:int;comment:寰俊璁㈠崟鐘舵��"`
 		WechatOrderStatus   WechatOrderStatus `json:"wechatOrderStatus" gorm:"foreignKey:WechatOrderStatusId"`
@@ -27,6 +28,7 @@
 		Phone               string            `json:"phone" gorm:"column:phone;type:varchar(255);comment:鐢佃瘽"`
 		Addressee           string            `json:"addressee" gorm:"column:addressee;type:varchar(255);comment:鏀朵欢浜�"`
 		Conditions          string            `json:"conditions" gorm:"column:conditions;type:text;comment:鏉′欢"`
+		CreatorId           int               `json:"creatorId" gorm:"column:creator_id;type:int;comment:鍒涘缓浜篿d"`
 		Remark              string            `json:"remark" gorm:"column:remark;type:text;comment:澶囨敞"`
 		Products            []*Product        `json:"products" gorm:"many2many:sales_details_product;"`
 		LogisticCompany     string            `json:"logisticCompany" gorm:"column:logistic_company;type:varchar(255);comment:鐗╂祦鍏徃"`
@@ -37,7 +39,7 @@
 		AmountInvoiced      decimal.Decimal   `gorm:"column:amount_invoiced;type:decimal(12,2);comment:宸插紑绁ㄩ噾棰�" json:"amountInvoiced"`       // 宸插紑绁ㄩ噾棰�
 		AmountUnInvoiced    decimal.Decimal   `gorm:"column:amount_not_invoiced;type:decimal(12,2);comment:鏈紑绁ㄩ噾棰�" json:"amountUnInvoiced"` // 鏈紑绁ㄩ噾棰�
 		AmountTotal         decimal.Decimal   `gorm:"column:amount_total;type:decimal(12,2);comment:浠风◣鍚堣" json:"amountTotal"`              // 浠风◣鍚堣
-		gorm.Model          `json:"-"`
+		CrmModel
 	}
 
 	SalesDetailsSearch struct {

--
Gitblit v1.8.0