From 0260b7a960b806e61ccd60597c549dfd595ba584 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 19 九月 2023 11:10:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
models/operation.go | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/models/operation.go b/models/operation.go
index 450bd27..5fa92ad 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -4,7 +4,6 @@
"fmt"
"gorm.io/gorm"
"wms/constvar"
- "wms/extend/util"
"wms/pkg/mysqlx"
)
@@ -21,7 +20,7 @@
FromLocation Location `json:"fromLocation" gorm:"foreignKey:FromLocationId"` //婧愪綅缃�
ToLocationId int `json:"toLocationId" gorm:"type:int;not null;comment:鐩爣浣嶇疆id"` //鐩爣浣嶇疆id
ToLocation Location `json:"toLocation" gorm:"foreignKey:ToLocationId"` //鐩爣浣嶇疆
- OperationDate util.JSONTime `json:"operationDate" gorm:"comment:瀹夋帓鏃ユ湡"`
+ OperationDate string `json:"operationDate" gorm:"type:varchar(31);comment:瀹夋帓鏃ユ湡"`
CarrierID int `json:"carrierID" gorm:"type:int;comment:鎵胯繍鍟咺D"`
CarrierName string `json:"carrierName" gorm:"type:varchar(63);comment:鎵胯繍鍟嗗悕绉�"`
Tracking string `json:"tracking" gorm:"type:varchar(127);comment:杩借釜鍙傝��"`
@@ -46,7 +45,7 @@
)
func (slf *Operation) TableName() string {
- return "operation"
+ return "wms_operation"
}
func NewOperationSearch() *OperationSearch {
--
Gitblit v1.8.0