From b156efaa0d9bc62c95d87f0b9ea916669c6c1d3e Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 04 三月 2024 10:47:11 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' 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