Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-07-18 9574cd990b7e32f966edc45824f8f952b5215d58

 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;
    }
}