Merge remote-tracking branch 'origin/master-base' into master-test

chenjiahe

2024-08-01 e74dade001072c3a0e93cd6d698df4df2262f5a3

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

@@ -12,6 +12,8 @@

    /** 退款的方式集合 */
    private List<OrderRefundNoteDto> orderRefundNoteDtos;
    /**装载已经退款的了退款方式，但是也要同步到CRM，要与orderRefundNoteDtos（上面那个参数）做交叉排查*/
    private List<OrderRefundNoteDto> orderRefundModelList;

    //操作人员id
    private String operationId;