From d20acf38c36c11ee4428c3e74a17f5870dc61b51 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 16 十一月 2023 09:51:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/SRM
---
model/test/request/product.go | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/model/test/request/product.go b/model/test/request/product.go
index b9c3c28..4949214 100644
--- a/model/test/request/product.go
+++ b/model/test/request/product.go
@@ -2,18 +2,29 @@
import (
"srm/model/common/request"
- "srm/model/test"
- "time"
)
type ProductSearch struct {
- test.Product
- SupplierNumber string `json:"supplierNumber" form:"supplierNumber"`
- StartCreatedAt *time.Time `json:"startCreatedAt" form:"startCreatedAt"`
- EndCreatedAt *time.Time `json:"endCreatedAt" form:"endCreatedAt"`
+ Product
request.PageInfo
}
type ProductCreate struct {
- List []*test.Product `json:"list"`
+ List []*Product `json:"list"`
+}
+
+type Product struct {
+ Name string `json:"name" form:"name" gorm:"column:name;comment:鍚嶇О;size:255;"`
+ Number string `json:"number" form:"number" gorm:"column:number;comment:缂栫爜;size:255;"`
+ SupplierId uint `json:"supplierId" form:"supplierId" gorm:"column:supplier_id;comment:渚涘簲鍟唅d;size:255;"`
+ Supplier string `json:"supplier" form:"supplier" gorm:"foreignKey:SupplierId;references:ID;comment:渚涘簲鍟�"`
+ Unit string `json:"unit" form:"unit" gorm:"column:unit;comment:璁￠噺鍗曚綅;size:255;"`
+ PurchasePrice float64 `json:"purchasePrice" form:"purchasePrice" gorm:"column:purchase_price;comment:閲囪喘浠锋牸;"`
+ DeliveryTime int `json:"deliveryTime" form:"deliveryTime" gorm:"column:delivery_time;comment:;size:11;"`
+ ShippingDuration int `json:"shippingDuration" form:"shippingDuration" gorm:"column:shipping_duration;comment:鐗╂祦鏃堕暱;size:11;"`
+ Specifications string `json:"specifications" form:"specifications" gorm:"column:specifications;comment:瑙勬牸;size:255;"`
+ ModelNumber string `json:"modelNumber" form:"modelNumber" gorm:"column:model_number;comment:鍨嬪彿;size:255;"`
+ CategoryName string `json:"categoryName" form:"categoryName" gorm:"column:category_name;comment:浜у搧绫诲埆;size:255;"`
+ SupplierName string `json:"supplierName" gorm:"-"`
+ SupplierNumber string `json:"supplierNumber" form:"supplierNumber"`
}
--
Gitblit v1.8.0