Merge branch 'fhx-prod-复购活动' into master-prod-new

fhx

2024-05-27 2d12c1e7182a0cf34d96536662bb3ca60afe4c0c

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