From d89d4a28653657528dc0718f1aa55e1c84ad1e6f Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期二, 19 四月 2022 10:36:18 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityActivityDto.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityActivityDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityActivityDto.java index acd8b6b..0c173c3 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityActivityDto.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityActivityDto.java @@ -129,5 +129,14 @@ @ApiModelProperty(value = "关键词") private String keyWord; + @ApiModelProperty(value = "用户id",hidden = true) + private Long userId; + + @ApiModelProperty(value = "是否是查询自己参与的活动(1.是 2.否)") + private Integer isUser = 2; + + @ApiModelProperty(value = "是否是小程序(1.是 2.否)") + private Integer isApplets; + } -- Gitblit v1.7.1