Merge branch 'master-stander' into master-jiayan

fwq

13 小时以前 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061

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

@@ -26,6 +26,9 @@
    /** 平台来源  因为是his助手取消订单的话就要自动确认退款单  必填*/
    private Integer platformSource;

    /** 取消订单备注 */
    private String remarks;

    /**his助手*/
    public static final Integer HIS_ASSISTANT = 0;
     /**his后台*/