Merge branch 'master-stander' into master-xlk

fhx

2024-07-12 5adefa2b0b6029e6b7fb7f55264f5c8860a4b559

 phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java

@@ -13,6 +13,11 @@
 */
@Data
public class PayAmountDto {
    /**是否已提前扣取,例如拼团订单先扣取,后续结账不用再扣减*/
    private Boolean isPay = false;
    /**已提前扣取的记录标识*/
    private String isPayId;

    /**必填 实际支付金额*/
    private BigDecimal amount;
    /**必填 支付方式*/