From 945561a655919045c3086f00d7d16dbc1d24c23f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 10:57:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MgtBasePlatformDto.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MgtBasePlatformDto.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MgtBasePlatformDto.java
index 6de32ac..242f255 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MgtBasePlatformDto.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MgtBasePlatformDto.java
@@ -21,30 +21,33 @@
@ApiModelProperty(value = "商户id集合",hidden = true)
private List<Long> shopIdList;
- @ApiModelProperty("店铺地址省code")
+ @ApiModelProperty(value="店铺地址省code")
private String shopProvinceCode;
- @ApiModelProperty("店铺地址市code")
+ @ApiModelProperty(value="店铺地址市code")
private String shopCityCode;
- @ApiModelProperty("店铺地址区code")
+ @ApiModelProperty(value="店铺地址区code")
private String shopAreaCode;
- @ApiModelProperty("部门id")
+ @ApiModelProperty(value="部门id")
private Long deptId;
- @ApiModelProperty("员工id")
+ @ApiModelProperty(value="员工id")
private Long userId;
@ApiModelProperty(value = "员工list",hidden = true)
private List<Long> userIdList;
- @ApiModelProperty("活动来源1平台2商户")
+ @ApiModelProperty(value="活动来源1平台2商户")
private Integer activityFrom;
- @ApiModelProperty("活动类型1秒杀")
+ @ApiModelProperty(value="活动类型1秒杀")
private Integer activityType;
- @ApiModelProperty("活动id")
- private Long activityId;
+ @ApiModelProperty(value="活动id")
+ private String activityId;
+
+ @ApiModelProperty(value = "年龄层 1 <20,2 21-30,3 31-40,4 41-50,5 >50")
+ private Integer ageType;
}
--
Gitblit v1.7.1