Merge remote-tracking branch 'origin/fhx-base-预约整合0808' into master-xlk

fhx

2024-08-12 1cc8d819402db6729edcd2cf0349ae8ab1a84ce0

 phis-feign/src/main/java/com/hz/his/dto/project/GoodsUpItemDto.java

@@ -14,7 +14,7 @@
    /**
     * 类型
     */
    private String type;
    private Integer type;
    /**
     * 标识
     */