From 9fd19bf6b3f7377e39708e929c811f66463f1bfd Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 05 二月 2024 19:15:25 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesTypeDto.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 5f9fc4e..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
@@ -11,10 +11,10 @@
/** 棰嗗缓id 淇敼蹇呭～蹇呭～ */
private String hisId;
/** 鍚嶇О 蹇呭～ */
- private String remarks;
+ private String name;
/** 涓婄骇鍒嗙被ID */
private String parentId;
- /** 绫诲瀷(鐗╄祫/鑽搧/椤圭洰) */
+ /** 绫诲瀷(鐗╄祫/鑽搧/椤圭洰) 鏂板蹇呭～*/
private String type;
/**绫诲瀷- 鐗╄祫*/
--
Gitblit v1.8.0