From c469e76e0c3eb803e7d190d105457224969c0bb4 Mon Sep 17 00:00:00 2001
From: manailin <manailin571521>
Date: 星期四, 29 九月 2022 08:37:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/sanshuohuitang_dev' into huacheng_test
---
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