From e1a6e20d22fbcb862247fac0a671a2a2722e7755 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 29 八月 2025 14:07:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy
---
main-business/src/main/java/com/ruoyi/business/entity/EquipmentManagement.java | 2 ++
1 files changed, 2 insertions(+), 0 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 7ad6c05..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;
@@ -80,5 +81,6 @@
* 鏄惁鑰楁潗绫�
*/
@TableField(value = "is_consumables")
+ @JsonProperty("isConsumables")
private boolean isConsumables;
}
\ No newline at end of file
--
Gitblit v1.9.3