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

fhx

2024-05-18 cb698b6c5a1ebeeb1efdff4b8ca62f00f4612b85

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