Merge branch 'fhx-prod-FDD' into master-test

fhx

2024-03-04 b156efaa0d9bc62c95d87f0b9ea916669c6c1d3e

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

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