Merge remote-tracking branch 'origin/xinghong-dev'

java110

2020-12-08 498288ba58aaeaea0453424a8f9b8448582ff0df

 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);
    }
}