记得上下班打卡 | git大法好,push需谨慎

Commit 72b933e4 authored by 张国柄's avatar 张国柄

recover: response data format;

parent 1516ed0c
...@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; ...@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.liquidnet.client.admin.common.core.controller.BaseController; import com.liquidnet.client.admin.common.core.controller.BaseController;
import com.liquidnet.client.admin.common.core.domain.AjaxResult; import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.zhengzai.candy.service.ICandyCouponAdminService; import com.liquidnet.client.admin.zhengzai.candy.service.ICandyCouponAdminService;
import com.liquidnet.client.admin.zhengzai.candy.service.ICandyCouponRuleAdminService; import com.liquidnet.client.admin.zhengzai.candy.service.ICandyCouponRuleAdminService;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.candy.dto.admin.CandyCouponListParam; import com.liquidnet.service.candy.dto.admin.CandyCouponListParam;
import com.liquidnet.service.candy.dto.admin.CandyCouponTemplateDto; import com.liquidnet.service.candy.dto.admin.CandyCouponTemplateDto;
import com.liquidnet.service.candy.entity.CandyCoupon; import com.liquidnet.service.candy.entity.CandyCoupon;
...@@ -37,7 +37,7 @@ public class CandyCouponAdminController extends BaseController { ...@@ -37,7 +37,7 @@ public class CandyCouponAdminController extends BaseController {
@ApiOperation(value = "券列表") @ApiOperation(value = "券列表")
@PostMapping("list") @PostMapping("list")
@ResponseBody @ResponseBody
public String list(CandyCouponListParam listParam) { public TableDataInfo list(CandyCouponListParam listParam) {
LambdaQueryWrapper<CandyCoupon> queryWrapper = Wrappers.lambdaQuery(CandyCoupon.class); LambdaQueryWrapper<CandyCoupon> queryWrapper = Wrappers.lambdaQuery(CandyCoupon.class);
queryWrapper.select(CandyCoupon::getCouponId, CandyCoupon::getTitle); queryWrapper.select(CandyCoupon::getCouponId, CandyCoupon::getTitle);
queryWrapper.orderByDesc(CandyCoupon::getCreatedAt); queryWrapper.orderByDesc(CandyCoupon::getCreatedAt);
...@@ -58,7 +58,7 @@ public class CandyCouponAdminController extends BaseController { ...@@ -58,7 +58,7 @@ public class CandyCouponAdminController extends BaseController {
} }
startPage(); startPage();
return JsonUtils.toJson(getDataTable(candyCouponAdminService.list(queryWrapper))); return getDataTable(candyCouponAdminService.list(queryWrapper));
} }
@ApiOperation(value = "券详情") @ApiOperation(value = "券详情")
......
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