From 703d5e3dcae6207ed85b0ce6d05f37ca0a36dc36 Mon Sep 17 00:00:00 2001 From: zhangxu <3%usVi4iXbVkhI1c> Date: 星期二, 06 十二月 2022 19:31:12 +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/ConsumablesTypeDto.java b/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesTypeDto.java index 5f9fc4e..3d6e253 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,7 +11,7 @@ /** 棰嗗缓id 淇敼蹇呭~蹇呭~ */ private String hisId; /** 鍚嶇О 蹇呭~ */ - private String remarks; + private String name; /** 涓婄骇鍒嗙被ID */ private String parentId; /** 绫诲瀷(鐗╄祫/鑽搧/椤圭洰) */ -- Gitblit v1.8.0