Merge branch 'master-zhangxu' into master-test

zhangxu

2022-12-07 bf1f6714fef31bf1e057e21bd7820a3b81610046

Merge branch 'master-zhangxu' into master-test

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

@@ -33,9 +33,9 @@
    /** 采购价  */
    private Number purchasePrice;
    /** 可销售的  */
    private Number salable;
    private Boolean salable;
    /** 售价  */
    private String sellingPrice;
    private Number sellingPrice;
    /** 规格  必填*/
    private String spec;
    /** 标准编码  */