From 5c565f444b2575024f947eca6f45d478405860d0 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期二, 20 十二月 2022 16:53:29 +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, 1 insertions(+), 1 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 3d6e253..fa734c7 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
@@ -14,7 +14,7 @@
     private String name;
     /** 涓婄骇鍒嗙被ID */
     private String parentId;
-    /** 绫诲瀷(鐗╄祫/鑽搧/椤圭洰) */
+    /** 绫诲瀷(鐗╄祫/鑽搧/椤圭洰) 鏂板蹇呭~*/
     private String type;
 
     /**绫诲瀷- 鐗╄祫*/

--
Gitblit v1.8.0