From f36fe3eca14e9a9543eb5dc8fa3bd9a7e3611b98 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 21 九月 2023 19:30:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
models/location.go | 1 +
controllers/location.go | 3 +++
docs/docs.go | 2 ++
3 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/controllers/location.go b/controllers/location.go
index 595a2ba..682c1f0 100644
--- a/controllers/location.go
+++ b/controllers/location.go
@@ -60,6 +60,9 @@
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
}
+ for _, location := range list {
+ location.JointName = location.ParentId + "/" + location.Name
+ }
util.ResponseFormatList(c, code.Success, list, int(total))
}
diff --git a/docs/docs.go b/docs/docs.go
index dc2974b..81492dd 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -2576,6 +2576,8 @@
Description: "",
InfoInstanceName: "swagger",
SwaggerTemplate: docTemplate,
+ LeftDelim: "{{",
+ RightDelim: "}}",
}
func init() {
diff --git a/models/location.go b/models/location.go
index ff81758..394e0bb 100644
--- a/models/location.go
+++ b/models/location.go
@@ -25,6 +25,7 @@
Notes string `json:"notes" gorm:"type:varchar(255);comment:澶栭儴澶囨敞"` //澶栭儴澶囨敞
RecentlyCount string `json:"recentlyCount" gorm:"type:varchar(255);comment:鏈�杩戠洏鐐�"` //鏈�杩戠洏鐐�
NextCount string `json:"nextCount" gorm:"type:varchar(255);comment:涓嬫鐩樼偣"` //涓嬫鐩樼偣
+ JointName string `json:"jointName" gorm:"-"` //鎷兼帴鍚嶇О
}
LocationSearch struct {
--
Gitblit v1.8.0