Merge branch 'fhx-prod-秒杀日历' into master-test

fhx

2024-05-31 4014253e14504a35b1c496bf3506c9bc23f640b5

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

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