liweifan преди 3 години
родител
ревизия
1f84223165

+ 0 - 1
cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityRewardController.java

@@ -79,7 +79,6 @@ public class ActivityRewardController extends BaseController {
     @ApiOperation(value = "查询列表", notes = "传入activityRewardSearch")
     @PreAuthorize("@pcs.hasPermissions('activityReward/list')")
     public HttpResponseResult<List<ActivityRewardVo>> list(@RequestBody ActivityRewardSearch query) {
-        query.setHasStock(YesOrNoEnum.YES);
         List<ActivityRewardVo> list = activityRewardService.selectAll(query);
         return succeed(list);
     }

+ 1 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityRewardSearch.java

@@ -24,7 +24,7 @@ public class ActivityRewardSearch extends QueryInfo{
 	private String rewardClient;
 
 	@ApiModelProperty("是否只查询有库存的数据 0 否 1 是")
-	private YesOrNoEnum hasStock = YesOrNoEnum.NO;
+	private YesOrNoEnum hasStock;
 
 	public String getRewardName() {
 		return rewardName;