From b0113676f423ca930bc3dd93ac9d9ea292458dfa Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 23 十一月 2023 11:28:56 +0800
Subject: [PATCH] 1.修改MoveHistory字段类型 2.完成MoveHistory插入数据 3.operation增加审批时间、收货人、收货地址、联系电话字段,并修改相应接口以及打印

---
 controllers/location.go |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/controllers/location.go b/controllers/location.go
index 29ad83b..80adda5 100644
--- a/controllers/location.go
+++ b/controllers/location.go
@@ -68,7 +68,8 @@
 	if params.PageInfo.Check() {
 		search.SetPage(params.Page, params.PageSize)
 	}
-	list, total, err := search.SetKeyword(params.KeyWord).SetType(params.Type).SetJointName(params.JointName).SetOrder("created_at desc").Find()
+	list, total, err := search.SetKeyword(params.KeyWord).SetType(params.Type).SetJointName(params.JointName).
+		SetIsScrapLocation(params.IsScrapLocation).SetOrder("created_at desc").Find()
 	if err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
 		return

--
Gitblit v1.8.0