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

puzhibing

2023-07-19 6cc28b0853183a0ede9f1e3addd7603095d98133

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

@@ -13,7 +13,7 @@
public class CommissionListWarpper {
    @ApiModelProperty("日期")
    private Long createTime;
    @ApiModelProperty("推广类型（1=用户，2=司机）")
    @ApiModelProperty("推广类型（1=线上收入，2=佣金，3=优惠券）")
    private Integer userType;
    @ApiModelProperty("获取佣金")
    private Double amount;