Merge branch 'master-base' into master-prod-new

fwq

2024-07-31 5fa87c35ad1c15b990d08e36a6c21471a4ab0c72

Merge branch 'master-base' into master-prod-new

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

@@ -17,6 +17,10 @@
    private String orderId;
    /**订单号*/
    private String orderNo;
    /**折扣优惠金额*/
    private BigDecimal discountTotal = BigDecimal.ZERO;
    /**审核状态*/
    private Integer applyStatus = -1;
    /**子单信息*/
    private List<CreateOrderReturnItemDto> itemDtoList;
    /**子单*/