From c0c3ba60f8620d2700c76afb62732ef940c38c70 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期六, 06 五月 2023 14:55:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' 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