Merge remote-tracking branch 'origin/master' into master-test

fwq

2022-12-12 541e9a5eb10f788f1f8067823fa6f71e1b52c31e

 phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesTypeDto.java

@@ -11,10 +11,10 @@
    /** 领建id 修改必填必填 */
    private String hisId;
    /** 名称 必填 */
    private String remarks;
    private String name;
    /** 上级分类ID */
    private String parentId;
    /** 类型(物资/药品/项目) */
    /** 类型(物资/药品/项目) 新增必填*/
    private String type;

    /**类型- 物资*/