Merge branch 'master-fwq-金额规则配置' into master-prod-new

fwq

2024-02-29 f9e94e1c87eb25f108c773312522c764d8dfd89f

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

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