Merge branch 'master-zhangxu' into master-test

zhangxu

2022-12-07 d541776cdcbf7f4f44bca632de515428dc276cd6

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

@@ -28,7 +28,7 @@
    private String nameENG;
    /** 备注  */
    private String note;
    /** 编号 必填  */
    /** 编号 必填  （注意编号不能重复）*/
    private String number;
    /** 采购价  */
    private Number purchasePrice;