From dfc2c78531b7ea0e27aff23a0f1d10a6b4bad49d Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 06 十一月 2023 15:00:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesTypeDto.java | 6 ++++--
1 files changed, 4 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 92f0a30..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
@@ -8,11 +8,13 @@
@Data
public class ConsumablesTypeDto {
+ /** 棰嗗缓id 淇敼蹇呭～蹇呭～ */
+ private String hisId;
/** 鍚嶇О 蹇呭～ */
- private String remarks;
+ private String name;
/** 涓婄骇鍒嗙被ID */
private String parentId;
- /** 绫诲瀷(鐗╄祫/鑽搧/椤圭洰) */
+ /** 绫诲瀷(鐗╄祫/鑽搧/椤圭洰) 鏂板蹇呭～*/
private String type;
/**绫诲瀷- 鐗╄祫*/
--
Gitblit v1.8.0