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

Pu Zhibing

7 天以前 64264bb278bbfaa8df29f5f19a59d4e8345b04aa

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MgtBasePlatformDto.java

@@ -47,4 +47,7 @@

    @ApiModelProperty(value="活动id")
    private String activityId;

    @ApiModelProperty(value = "年龄层 1 <20,2 21-30,3 31-40,4 41-50,5 >50")
    private Integer ageType;
}