Merge branch 'master-prod-new' into master-fwq-爆款活动2.0

fwq

2024-06-13 653a27e1cc457f7bc887a6aa81ff00717e4282f4

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