From a3a2fe8909a84e177f3f8d183987eff4e391ea7b Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期四, 16 二月 2023 15:56:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' 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