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

huliguo

9 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/StaffShopTaskPageVo.java

@@ -52,4 +52,7 @@
    
    @ApiModelProperty(value = "添加用户id")
    private Long createUserId;
    
    @ApiModelProperty(value = "任务状态0未开始1待处理2已处理3已过期")
    private Integer taskStatus;
}