Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-03-09 c9a112ea32e72aacd025f2ecb3024e72528c2e0c

Merge branch 'master' into master-test

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

@@ -22,7 +22,9 @@
    private Integer refundNum;
    /** 实退金额 */
    private BigDecimal refundMoney;
    /** 实退原因 */
    /** 退款原因（员工） */
    private String remarks;
    /** 退款原因（用户） */
    private String refundReason;

    /** 退款二级子订单信息集合 */

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

@@ -21,6 +21,8 @@
    private Integer refundNum;
    /** 实退金额 */
    private BigDecimal refundMoney;
    /** 实退原因 */
    /** 退款原因（员工） */
    private String remarks;
    /** 退款原因（用户） */
    private String refundReason;
}

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

@@ -14,8 +14,10 @@

    /** 退款方式集合 */
    private List<OrderPayMethodDto> refundPayMethod;
    /** 备注 */
    /** 退款备注（员工） */
    private String remarks;
    /** 退款原因（用户） */
    private String refundReason;
    /** 退款信息集合 */
    private List<OrderItemRefundDto> refundList;
    /** 订单id */