From 4494e9a0e1e02521c4654b17bee1a0344f70966e Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期六, 06 五月 2023 15:49:42 +0800
Subject: [PATCH] 作废退款

---
 phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 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..0eab036 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;
     /** 鏍囧噯缂栫爜  */
@@ -43,7 +45,7 @@
     /** 鍗曚綅  蹇呭~*/
     private String unit;
 
-    /** 鐗╄祫绫诲瀷锛堝晢鍝�/鑽搧锛� */
+    /** 鐗╄祫绫诲瀷锛堝晢鍝�/鑽搧锛� 蹇呭~*/
     private String type;
 
     /**绫诲瀷- 鍟嗗搧*/

--
Gitblit v1.8.0