Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-07-26 0b806dd3c5159d8fac767cf027b0301e583d1161

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

@@ -46,5 +46,5 @@
    private Integer activityType;

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