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

fwq

2024-02-29 41cd83bda10e3d21bf8e3812b5be931da8bc6f3a

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