From bf1f6714fef31bf1e057e21bd7820a3b81610046 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期三, 07 十二月 2022 16:18:18 +0800
Subject: [PATCH] Merge branch 'master-zhangxu' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java b/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java
index 00c5bcd..f772818 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java
@@ -7,6 +7,8 @@
*/
@Data
public class ConsumablesDto {
+ /** 棰嗗缓id 淇敼蹇呭～蹇呭～ */
+ private String hisId;
/** 涓枃绠�绉� */
private String aliasCHS;
@@ -26,14 +28,14 @@
private String nameENG;
/** 澶囨敞 */
private String note;
- /** 缂栧彿 蹇呭～ */
+ /** 缂栧彿 蹇呭～ 锛堟敞鎰忕紪鍙蜂笉鑳介噸澶嶏級*/
private String number;
/** 閲囪喘浠� */
private Number purchasePrice;
/** 鍙攢鍞殑 */
- private Number salable;
+ private Boolean salable;
/** 鍞环 */
- private String sellingPrice;
+ private Number sellingPrice;
/** 瑙勬牸 蹇呭～*/
private String spec;
/** 鏍囧噯缂栫爜 */
--
Gitblit v1.8.0