From 27be7a2c517404e4622470edf7b83b13129220ff Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 08 十二月 2023 11:14:04 +0800
Subject: [PATCH] merge conflicts
---
request/location.go | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/request/location.go b/request/location.go
index a762856..8f6546d 100644
--- a/request/location.go
+++ b/request/location.go
@@ -9,6 +9,8 @@
type GetLocationList struct {
PageInfo
- KeyWord string `json:"keyWord"`
- JointName string `json:"jointName"` //鎷兼帴鍚嶇О
+ Type int `json:"type"`
+ KeyWord string `json:"keyWord"`
+ JointName string `json:"jointName"` //鎷兼帴鍚嶇О
+ IsScrapLocation bool `json:"isScrapLocation"` //鏄惁鎶ュ簾
}
--
Gitblit v1.8.0