From b6102728f433cfeb302661a4bff1ab069d182bf0 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期二, 06 十二月 2022 19:28:05 +0800
Subject: [PATCH] Merge branch 'master-zhangxu' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesTypeDto.java b/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesTypeDto.java
index 92f0a30..5f9fc4e 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesTypeDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesTypeDto.java
@@ -8,6 +8,8 @@
 @Data
 public class ConsumablesTypeDto {
 
+    /** 棰嗗缓id 淇敼蹇呭~蹇呭~ */
+    private String hisId;
     /** 鍚嶇О 蹇呭~ */
     private String remarks;
     /** 涓婄骇鍒嗙被ID */

--
Gitblit v1.8.0