diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java index 00bca533..53b77572 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java @@ -209,7 +209,8 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl pinkAll; + + @ApiModelProperty(value = "拼团状态 0未成功,进行中 1已成功 -1拼团失败") private Integer pinkBool = 0; + + @ApiModelProperty(value = "拼团信息") private YxStorePinkQueryVo pinkT; + + @ApiModelProperty(value = "拼团内容信息") private YxStoreCombinationQueryVo storeCombination; + + @ApiModelProperty(value = "拼团内容") private String storeCombinationHost; + + @ApiModelProperty(value = "是否在团内 0不在 1在") private Integer userBool = 0; + + @ApiModelProperty(value = "拼团用户信息") private YxUserQueryVo userInfo; } diff --git a/yshop-mproot/src/main/java/co/yixiang/common/web/param/QueryParam.java b/yshop-mproot/src/main/java/co/yixiang/common/web/param/QueryParam.java index 4f0540a8..4da701a3 100644 --- a/yshop-mproot/src/main/java/co/yixiang/common/web/param/QueryParam.java +++ b/yshop-mproot/src/main/java/co/yixiang/common/web/param/QueryParam.java @@ -24,6 +24,7 @@ public abstract class QueryParam implements Serializable{ @ApiModelProperty(value = "搜索字符串") private String keyword; + @ApiModelProperty(value = "当前第几页") public void setCurrent(Integer current) { if (current == null || current <= 0){ this.page = 1;