Merge branch 'master-base' into master-test

fhx

2024-08-02 bc798685f11aeec95e64c25b0a4594d8876d881d

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