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

chenjiahe

2024-02-23 e7d554f4f8f79eafaa2de3abe036d21e300fd14a

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