Merge branch 'master-prod-new' into master-stander

cmg

2024-05-27 c2af7240d43586b8e3cc295e9e97f7d24278025d

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

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