From ee1d8e5a751a7b73cf5206c7b91ff6cc19b20d38 Mon Sep 17 00:00:00 2001 From: zhangxu <3%usVi4iXbVkhI1c> Date: 星期四, 08 十二月 2022 18:06:45 +0800 Subject: [PATCH] Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign into master-zhangxu --- 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