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

fwq

2023-11-14 9a9e8d995ea4c95e0303b456cf6fcd4188f97366

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