From d85105fd3f9713633e70583ad28de8e65319607f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 24 十一月 2023 17:03:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

---
 models/move_history.go |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/models/move_history.go b/models/move_history.go
index ff02764..ef75cbd 100644
--- a/models/move_history.go
+++ b/models/move_history.go
@@ -17,7 +17,7 @@
 		BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"type:tinyint;not null;comment:鍩虹浣滀笟绫诲瀷"`      //鍩虹浣滀笟绫诲瀷
 		OperationTypeId   int                        `json:"operationTypeId" gorm:"type:int;not null;comment:浣滀笟绫诲瀷id"`            //浣滀笟绫诲瀷id
 		OperationTypeName string                     `json:"operationTypeName" gorm:"type:varchar(127);not null;comment:浣滀笟绫诲瀷鍚嶇О"` //浣滀笟绫诲瀷鍚嶇О
-		OperationId       int                        `json:"operationRecordId" gorm:"type:int;not null;comment:鎿嶄綔id"`            //鎿嶄綔id
+		OperationId       int                        `json:"operationId" gorm:"type:int;not null;comment:鎿嶄綔id"`                  //鎿嶄綔id
 		ProductId         string                     `json:"productId" gorm:"type:varchar(255);not null;comment:浜у搧id"`           //浜у搧id
 		ProductName       string                     `json:"productName" gorm:"type:varchar(255);not null;comment:浜у搧鍚嶇О"`         //浜у搧鍚嶇О
 		Amount            decimal.Decimal            `json:"amount" gorm:"type:decimal(20,2);not null;comment:鏁伴噺"`               //鏁伴噺

--
Gitblit v1.8.0