Merge branch 'master-fwq-积分抵扣现金' into master-test

fwq

2024-04-29 db07d8230cf1f18c0ee73312618d8e90b69945b4

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

@@ -11,4 +11,10 @@
    /**订单标识*/
    private String orderId;

    public OrderInitVo() {
    }

    public OrderInitVo(String orderId) {
        this.orderId = orderId;
    }
}