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

huliguo

2 天以前 a966dafb8877552267a94fe8c544c5ea72cf5650

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

@@ -19,6 +19,12 @@
    @ApiModelProperty(value = "商户id")
    private Long shopId;

    @ApiModelProperty(value = "活动来源1平台活动2店铺活动")
    private Integer activityFrom;

    @ApiModelProperty(value = "活动类型1秒杀")
    private Integer activityType;

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