From 12e09639dcbfa63b5a23cde8642b72829d4f3a3b Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 10 八月 2023 11:42:31 +0800
Subject: [PATCH] Merge branch 'zq'

---
 model/product.go |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/model/product.go b/model/product.go
index 029857b..a61ee23 100644
--- a/model/product.go
+++ b/model/product.go
@@ -1,15 +1,18 @@
 package model
 
-import "gorm.io/gorm"
+import (
+	"github.com/shopspring/decimal"
+	"gorm.io/gorm"
+)
 
 type Product struct {
-	Id         int     `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
-	Name       string  `json:"name" gorm:"column:name;type:varchar(255);comment:浜у搧鍚嶇О"`
-	Price      float64 `json:"price" gorm:"column:price;type:decimal(10,2);comment:浜у搧浠锋牸"`
-	Number     string  `json:"number" gorm:"column:number;type:varchar(255);comment:浜у搧缂栧彿"`
-	Amount     int     `json:"amount" gorm:"column:amount;type:int;comment:浜у搧鏁伴噺"`
-	Total      float64 `json:"total" gorm:"column:total;type:decimal(10,2);comment:浜у搧鎬讳环"`
-	Desc       string  `json:"desc" gorm:"column:desc;type:varchar(255);comment:浜у搧鎻忚堪"`
+	Id         uint            `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+	Name       string          `json:"name" gorm:"column:name;type:varchar(255);comment:浜у搧鍚嶇О"`
+	Price      decimal.Decimal `json:"price" gorm:"column:price;type:decimal(10,2);comment:浜у搧浠锋牸"`
+	Number     string          `json:"number" gorm:"column:number;type:varchar(255);comment:浜у搧缂栧彿"`
+	Amount     decimal.Decimal `json:"amount" gorm:"column:amount;type:int;comment:浜у搧鏁伴噺"`
+	Total      decimal.Decimal `json:"total" gorm:"column:total;type:decimal(10,2);comment:浜у搧鎬讳环"`
+	Desc       string          `json:"desc" gorm:"column:desc;type:varchar(255);comment:浜у搧鎻忚堪"`
 	gorm.Model `json:"-"`
 }
 

--
Gitblit v1.8.0