Merge remote-tracking branch 'origin/master'

liujie

2023-08-16 5cb1979f05446792cc33a8cb6b7aaae906da5a70

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/CommissionListWarpper.java

@@ -13,8 +13,10 @@
public class CommissionListWarpper {
    @ApiModelProperty("日期")
    private Long createTime;
    @ApiModelProperty("推广类型（1=用户，2=司机）")
    @ApiModelProperty("推广类型（1=订单收入，4=提现，5=佣金收入，7优惠券收入）")
    private Integer userType;
    @ApiModelProperty("获取佣金")
    private Double amount;
    @ApiModelProperty("余额")
    private Double money;
}