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

puzhibing

2023-07-20 e8ce24f3a378d1fdb5c1c9e6fbecb067aa22cdd9

 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java

@@ -35,6 +35,8 @@
    private Double discountedPrice;
    @ApiModelProperty("恶劣天气费")
    private Double badWeatherPrice;
    @ApiModelProperty("订单金额")
    private Double orderMoney;
    @ApiModelProperty("支付金额")
    private Double payMoney;
}