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

chenjiahe

2024-04-01 de32b282b013dae62543650d75611f85db164010

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

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