From 85d1dc328bd46089b63b57bd356908cbba26e29c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 23 十月 2023 16:45:19 +0800
Subject: [PATCH] Merge branch 'master' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java b/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java
index f772818..0eab036 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java
@@ -45,7 +45,7 @@
     /** 鍗曚綅  蹇呭~*/
     private String unit;
 
-    /** 鐗╄祫绫诲瀷锛堝晢鍝�/鑽搧锛� */
+    /** 鐗╄祫绫诲瀷锛堝晢鍝�/鑽搧锛� 蹇呭~*/
     private String type;
 
     /**绫诲瀷- 鍟嗗搧*/

--
Gitblit v1.8.0