From 5e1aa408c1b8bd36fefd0b5ea380a2fde6d57810 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 27 十二月 2023 17:35:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/SRM

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

diff --git a/model/purchase/purchase.go b/model/purchase/purchase.go
index 27de935..df91ce9 100644
--- a/model/purchase/purchase.go
+++ b/model/purchase/purchase.go
@@ -7,11 +7,11 @@
 )
 
 type Purchase struct {
-	global.GVA_MODEL
-	PurchaseTypeId      int                 `json:"purchaseTypeId" form:"purchaseType" gorm:"type:int(11);not null;default 0;comment:閲囪喘绫诲瀷id"` // 閲囪喘绫诲瀷id
+	global.GVA_MODEL_INT
+	PurchaseTypeId      int                 `json:"purchaseTypeId,string" form:"purchaseType" gorm:"type:int(11);not null;default 0;comment:閲囪喘绫诲瀷id"` // 閲囪喘绫诲瀷id
 	PurchaseType        PurchaseType        `json:"purchaseType" gorm:"foreignKey:PurchaseTypeId"`
-	OrderSource         string              `json:"orderSource" gorm:"type:varchar(255);not null;default '';comment:鍗曟嵁鏉ユ簮"`             // 鍗曟嵁鏉ユ簮
-	SupplierId          int                 `json:"supplierId" form:"supplierId" gorm:"type:int(11);not null;default 0;comment:渚涘簲鍟唅d"` // 渚涘簲鍟唅d
+	OrderSource         string              `json:"orderSource" gorm:"type:varchar(255);not null;default '';comment:鍗曟嵁鏉ユ簮"`                    // 鍗曟嵁鏉ユ簮
+	SupplierId          int                 `json:"supplierId,string" form:"supplierId" gorm:"type:int(11);not null;default 0;comment:渚涘簲鍟唅d"` // 渚涘簲鍟唅d
 	Supplier            test.Supplier       `json:"supplier" gorm:"foreignKey:SupplierId"`
 	Number              string              `json:"number" form:"number" gorm:"unique;type:varchar(255);not null;default '';comment:閲囪喘缂栧彿"`                  // 閲囪喘缂栧彿
 	Name                string              `json:"name" form:"name" gorm:"type:varchar(255);not null;default '';comment:閲囪喘鍚嶇О"`                             // 閲囪喘鍚嶇О

--
Gitblit v1.8.0