Merge remote-tracking branch 'origin/master'

xuhy

2023-04-10 52f9908cf1f565da1d0068329c7218038dade6eb

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

@@ -52,6 +52,8 @@
    private Double overBadWeatherPrice;
    @ApiModelProperty("折扣金额")
    private Double discountAmount;
    @ApiModelProperty("优惠金额")
    private Double discountedPrice;
    @ApiModelProperty("微信收款码")
    private String wxCollectionCode;
    @ApiModelProperty("支付宝收款码")