Commit 7f5d371a authored by hezhen's avatar hezhen

Merge branch 'master-tiande' into dev-tiande

parents c593a7cd f9ee0dcc
...@@ -12,12 +12,14 @@ import com.xxfc.platform.tour.dto.TourGoodDTO; ...@@ -12,12 +12,14 @@ import com.xxfc.platform.tour.dto.TourGoodDTO;
import com.xxfc.platform.tour.entity.TourGood; import com.xxfc.platform.tour.entity.TourGood;
import com.xxfc.platform.tour.vo.TourGoodDetailVo; import com.xxfc.platform.tour.vo.TourGoodDetailVo;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequestMapping("good") @RequestMapping("good")
@IgnoreClientToken @IgnoreClientToken
@Slf4j
public class TourGoodAdminController extends BaseController<TourGoodBiz, TourGood> implements UserRestInterface { public class TourGoodAdminController extends BaseController<TourGoodBiz, TourGood> implements UserRestInterface {
@Autowired @Autowired
...@@ -35,6 +37,7 @@ public class TourGoodAdminController extends BaseController<TourGoodBiz, TourGoo ...@@ -35,6 +37,7 @@ public class TourGoodAdminController extends BaseController<TourGoodBiz, TourGoo
@RequestMapping(value = "/admin/goodList", method = RequestMethod.POST) @RequestMapping(value = "/admin/goodList", method = RequestMethod.POST)
public ObjectRestResponse<TourGood> goodList(@RequestBody GoodSearchDTO dto) { public ObjectRestResponse<TourGood> goodList(@RequestBody GoodSearchDTO dto) {
setPowerData(dto,true); setPowerData(dto,true);
log.info("GoodSearchDTO",dto);
return ObjectRestResponse.succ(baseBiz.getAll(dto)); return ObjectRestResponse.succ(baseBiz.getAll(dto));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment