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

luodangjia

2024-07-17 736ab0090700c75af37b8a3456b01609e4e2d329

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/QueryHistoricalSettlement.java

@@ -17,4 +17,6 @@
    private Double price;
    @ApiModelProperty("结算周期（1=日结算，2=周结算，3=月结算）")
    private Integer type;
    @ApiModelProperty("支付方式")
    private String payType;
}