From d346846239a8a39246c464dc634f5fd72add99ab Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 26 八月 2025 15:22:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy
---
main-business/src/main/java/com/ruoyi/business/vo/EquipmentManagementVo.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/vo/EquipmentManagementVo.java b/main-business/src/main/java/com/ruoyi/business/vo/EquipmentManagementVo.java
index 3ec641c..b137ddf 100644
--- a/main-business/src/main/java/com/ruoyi/business/vo/EquipmentManagementVo.java
+++ b/main-business/src/main/java/com/ruoyi/business/vo/EquipmentManagementVo.java
@@ -1,5 +1,6 @@
package com.ruoyi.business.vo;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
@Data
@@ -10,4 +11,7 @@
private String equipmentName; //璁惧鍚嶇О
private Integer quantity; //鏁伴噺
+
+ @JsonProperty("isConsumables")
+ private boolean isConsumables; //鏄惁鑰楁潗绫�
}
--
Gitblit v1.9.3