Merge branch 'master' into master-test

wangrenhuang

2023-10-10 b99a9da5e9d943ea1b6e5578501a11dc19fae553

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

@@ -11,4 +11,6 @@
public class ConsumablesDto extends PageDto {
    /**更新时间*/
    private String editTime;
    /** 购买数量 */
    private Integer buyNum;
}