From 498288ba58aaeaea0453424a8f9b8448582ff0df Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 08 十二月 2020 14:52:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
service-user/src/main/java/com/java110/user/api/OwnerApi.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/api/OwnerApi.java b/service-user/src/main/java/com/java110/user/api/OwnerApi.java
index a7aed35..634de1d 100644
--- a/service-user/src/main/java/com/java110/user/api/OwnerApi.java
+++ b/service-user/src/main/java/com/java110/user/api/OwnerApi.java
@@ -74,7 +74,8 @@
@RequestMapping(value = "/comprehensiveQuery", method = RequestMethod.GET)
public ResponseEntity<String> comprehensiveQuery(@RequestParam(value = "communityId") String communityId,
@RequestParam(value = "searchValue") String searchValue,
- @RequestParam(value = "searchType") String searchType) {
- return comprehensiveQueryImpl.query(communityId, searchValue, searchType);
+ @RequestParam(value = "searchType") String searchType,
+ @RequestHeader(value = "user-id") String userId) {
+ return comprehensiveQueryImpl.query(communityId, searchValue, searchType,userId);
}
}
--
Gitblit v1.8.0