From 215884a441b4e28fff1ddf5a41a354c38a47e284 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期二, 06 十二月 2022 18:52:11 +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/ConsumablesType.java b/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesTypeDto.java
similarity index 93%
rename from phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesType.java
rename to phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesTypeDto.java
index b2abe20..92f0a30 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesType.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesTypeDto.java
@@ -6,7 +6,7 @@
  * @Author  鐗╂枡鍒嗙被
  */
 @Data
-public class ConsumablesType {
+public class ConsumablesTypeDto {
 
     /** 鍚嶇О 蹇呭~ */
     private String remarks;

--
Gitblit v1.8.0