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

Commit 90ca54a5 authored by 胡佳晨's avatar 胡佳晨

修改 pos banner

parent ec9b646b
...@@ -177,7 +177,7 @@ public class GoblinCouponController { ...@@ -177,7 +177,7 @@ public class GoblinCouponController {
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "类型 1可用 2过期/已使用"), @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "类型 1可用 2过期/已使用"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "uid", value = "用户id"), @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "uid", value = "用户id"),
}) })
public ResponseDto<List<GoblinUserCouponVo>> getList(@RequestParam("type") @Valid String type,@RequestParam("uid") @Valid String uid) { public ResponseDto<List<GoblinUserCouponVo>> getList(@RequestParam("type") @Valid String type,@RequestParam(value = "uid",required = false) String uid) {
if(uid==null || uid.equals("")){ if(uid==null || uid.equals("")){
uid = CurrentUtil.getCurrentUid(); uid = CurrentUtil.getCurrentUid();
} }
......
...@@ -42,11 +42,11 @@ public class KylinBannersController { ...@@ -42,11 +42,11 @@ public class KylinBannersController {
}) })
public ResponseDto<List<KylinBanners>> blist( public ResponseDto<List<KylinBanners>> blist(
@RequestParam() String position, @RequestParam() String position,
@RequestParam() String marketId, @RequestParam(value = "marketId", required = false) String marketId,
@RequestParam(defaultValue = "") String provinceName @RequestParam(defaultValue = "") String provinceName
) { ) {
try { try {
List<KylinBanners> result = bannersServiceImpl.blist(position, provinceName,marketId); List<KylinBanners> result = bannersServiceImpl.blist(position, provinceName, marketId);
return ResponseDto.success(result); return ResponseDto.success(result);
} catch (Exception e) { } catch (Exception e) {
log.error("banner列表Error", e); log.error("banner列表Error", e);
......
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