From 2656ae9bce8544d81da66c07aaede5386d6fbebb Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 25 七月 2025 15:41:01 +0800
Subject: [PATCH] 1.序列化问题 2.设备领用逻辑优化
---
main-business/src/main/java/com/ruoyi/business/entity/EquipmentManagement.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/entity/EquipmentManagement.java b/main-business/src/main/java/com/ruoyi/business/entity/EquipmentManagement.java
index 4cb21c4..9e03627 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/EquipmentManagement.java
+++ b/main-business/src/main/java/com/ruoyi/business/entity/EquipmentManagement.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import com.ruoyi.common.core.domain.MyBaseEntity;
@@ -28,8 +29,8 @@
/**
* 璁惧缂栧彿
*/
- @TableField(value = "equipment_id")
- private String equipmentId;
+ @TableField(value = "equipment_no")
+ private String equipmentNo;
/**
* 璁惧鍚嶇О
*/
@@ -76,4 +77,10 @@
*/
@TableField(value = "purchase_price")
private BigDecimal purchasePrice;
+ /**
+ * 鏄惁鑰楁潗绫�
+ */
+ @TableField(value = "is_consumables")
+ @JsonProperty("isConsumables")
+ private boolean isConsumables;
}
\ No newline at end of file
--
Gitblit v1.9.3