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

fhx

2023-11-09 59f57d0a99d677ed4e341f413267612df7fb6bb9

 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;
}