Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

fwq

2024-02-07 5130ec75c97e97592b5d5468273bd2187fd1fa12

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