From f6e7379fbfbba4f6667944a2be62f99461bf97f0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 26 六月 2024 16:14:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
index 9d59109..c916831 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
@@ -46,9 +46,10 @@
 
     @ValueTableShow(4)
     @ApiModelProperty(value = "鍗曚环(鍏�)")
-    private BigDecimal price;
+    private String price;
 
     @ApiModelProperty(value = "鍦烘墍")
+    @ValueTableShow(4)
     private String laboratory;
 
     @ValueTableShow(4)

--
Gitblit v1.9.3