Merge branch 'master-tiande' into dev-tiande

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

@@ -34,8 +34,8 @@ public class TourGoodAdminController extends BaseController<TourGoodBiz, TourGoo
     }
 
     @ApiOperation("后台查询旅游路线列表")
-    @RequestMapping(value = "/admin/goodList", method = RequestMethod.POST)
-    public ObjectRestResponse<TourGood> goodList(@RequestBody GoodSearchDTO dto) {
+    @RequestMapping(value = "/admin/goodList", method = RequestMethod.GET)
+    public ObjectRestResponse<TourGood> goodList(GoodSearchDTO dto) {
         setPowerData(dto,true);
         log.info("GoodSearchDTO",dto);
         return ObjectRestResponse.succ(baseBiz.getAll(dto));