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/response/product.go |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/model/test/response/product.go b/model/test/response/product.go
index 853d096..928f4a7 100644
--- a/model/test/response/product.go
+++ b/model/test/response/product.go
@@ -15,4 +15,17 @@
 	MaximumStock     int64   `json:"maximumStock" form:"maximumStock" gorm:"column:maximum_stock;comment:鏈�楂樺簱瀛�;"`
 	Remark           string  `json:"remark" form:"remark" gorm:"column:remark;comment:澶囨敞;size:255;"`
 	SupplierName     string  `json:"supplierName" gorm:"-"`
+	CategoryName     string  `gorm:"type:varchar(255);comment:浜у搧绫诲埆鍚嶇О" json:"categoryName"` //浜у搧绫诲埆鍚嶇О
+}
+
+type Material 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;"`
+	Unit           string `json:"unit" form:"unit" gorm:"column:unit;comment:璁¢噺鍗曚綅;size:255;"`
+	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;"`
+	MinimumStock   int64  `json:"minimumStock" form:"minimumStock" gorm:"column:minimum_stock;comment:鏈�浣庡簱瀛�;"`
+	MaximumStock   int64  `json:"maximumStock" form:"maximumStock" gorm:"column:maximum_stock;comment:鏈�楂樺簱瀛�;"`
+	Remark         string `json:"remark" form:"remark" gorm:"column:remark;comment:澶囨敞;size:255;"`
+	CategoryName   string `gorm:"type:varchar(255);comment:浜у搧绫诲埆鍚嶇О" json:"categoryName"` //浜у搧绫诲埆鍚嶇О
 }

--
Gitblit v1.8.0