Merge branch 'master-fwq-颜值规划4.0' into master-prod-new

fwq

2024-04-15 7285f70c4804d88c175ace932956eec524e2ceda

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

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