Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/admin/TourGoodController.java

+package com.xxfc.platform.tour.rest.admin;
+
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.tour.biz.TourGoodBiz;
+import com.xxfc.platform.tour.entity.TourGood;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("good")
+@IgnoreClientToken
+public class TourGoodController extends BaseController<TourGoodBiz, TourGood> {
+
+    /**
+     * 查询旅游路线列表
+     *
+     * @param page
+     * @param limit
+     * @param query
+     * @param latitude
+     * @param longitude
+     * @param tagId
+     * @param distance
+     * @return
+     */
+    @ApiOperation("查询旅游路线列表")
+    @RequestMapping(value = "//getGoodList", method = RequestMethod.GET)
+
+    public ObjectRestResponse<TourGood> getGoodList(@RequestParam(value = "page", required = true) Integer page, @RequestParam(value = "limit", required = true) Integer limit,
+                                          @RequestParam(value = "query", required = false) String query, @RequestParam(value = "latitude", required = false) Double latitude,
+                                          @RequestParam(value = "longitude", required = false) Double longitude, @RequestParam(value = "tagId", required = false) Integer tagId,
+                                          @RequestParam(value = "distance", defaultValue = "10.00") Double distance) {
+        return baseBiz.getGoodList(page, limit, query, latitude, longitude, tagId, distance);
+    }
+}
\ No newline at end of file