Merge remote-tracking branch 'origin/master-base' into master-prod-new

rx

2024-08-05 d621324bcf6c5a26f058b24e0f4d2930f41840f4

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

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


}