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

Commit dea4c4a2 authored by 胡佳晨's avatar 胡佳晨

Merge remote-tracking branch 'origin/dev_nft_411' into dev_nft_411

parents 995e306b b5bd51e4
...@@ -17,7 +17,7 @@ import java.time.LocalDateTime; ...@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
* @since 2022-04-08 * @since 2022-04-08
*/ */
@Data @Data
public class GoblinGoodsAnticipateValueVo { public class GoblinGoodsAnticipateValueVo implements Cloneable{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -92,4 +92,16 @@ public class GoblinGoodsAnticipateValueVo { ...@@ -92,4 +92,16 @@ public class GoblinGoodsAnticipateValueVo {
@ApiModelProperty(value = "删除(0:未删除1:已删除)") @ApiModelProperty(value = "删除(0:未删除1:已删除)")
private Integer delTag; private Integer delTag;
private static final GoblinGoodsAnticipateValueVo obj = new GoblinGoodsAnticipateValueVo();
public static GoblinGoodsAnticipateValueVo getNew() {
try {
return (GoblinGoodsAnticipateValueVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new GoblinGoodsAnticipateValueVo();
}
}
} }
...@@ -144,6 +144,8 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS ...@@ -144,6 +144,8 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
anticipateValueVo.setState(setState(anticipateValueVo.getAboutStartDate(), anticipateValueVo.getAboutEndDate())); anticipateValueVo.setState(setState(anticipateValueVo.getAboutStartDate(), anticipateValueVo.getAboutEndDate()));
} }
pageInfo.setPageNum(goodsAnticipateValueParam.getPageNum());
pageInfo.setPageSize(20);
pageInfo.setList(data); pageInfo.setList(data);
pageInfo.setTotal((Long) map.get("total")); pageInfo.setTotal((Long) map.get("total"));
return ResponseDto.success(pageInfo); return ResponseDto.success(pageInfo);
......
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