From 85d1dc328bd46089b63b57bd356908cbba26e29c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 23 十月 2023 16:45:19 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java | 6 +++---
1 files changed, 3 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 8b6a737..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
@@ -33,9 +33,9 @@
/** 閲囪喘浠� */
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