Merge branch 'master-prod-new' into master-fwq-爆款活动2.0

fwq

2024-06-13 653a27e1cc457f7bc887a6aa81ff00717e4282f4

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

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