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

puzhibing

2024-05-09 23492ba390fd61d23a160b06595d72ce498a8340

 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;
}