From b156efaa0d9bc62c95d87f0b9ea916669c6c1d3e Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 04 三月 2024 10:47:11 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java | 8 ++++----
1 files changed, 4 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 e8c308a..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
@@ -28,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;
/** 鏍囧噯缂栫爜 */
@@ -45,7 +45,7 @@
/** 鍗曚綅 蹇呭～*/
private String unit;
- /** 鐗╄祫绫诲瀷锛堝晢鍝�/鑽搧锛� */
+ /** 鐗╄祫绫诲瀷锛堝晢鍝�/鑽搧锛� 蹇呭～*/
private String type;
/**绫诲瀷- 鍟嗗搧*/
--
Gitblit v1.8.0