From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/consumables/ConsumablesDto.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/consumables/ConsumablesDto.java b/phis-feign/src/main/java/com/hz/his/dto/consumables/ConsumablesDto.java
index 031d046..c0bf96e 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/consumables/ConsumablesDto.java
+++ b/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;
 }

--
Gitblit v1.8.0