Merge branch 'master' into master-test

wangrenhuang

2023-04-18 cc35e61d33b2421344bb22eb1ba50d093eacb562

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