From 7cfabd1ac4797179d252b6c68a5d394c888aea7a Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 31 三月 2025 16:32:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-msi/src/main/java/org/jeecg/modules/msi/webapi/vo/MachineEquipentInfo.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/vo/MachineEquipentInfo.java b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/webapi/vo/MachineEquipentInfo.java
similarity index 75%
rename from lxzn-module-msi/src/main/java/org/jeecg/modules/msi/vo/MachineEquipentInfo.java
rename to lxzn-module-msi/src/main/java/org/jeecg/modules/msi/webapi/vo/MachineEquipentInfo.java
index 1f07c46..1679cd1 100644
--- a/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/vo/MachineEquipentInfo.java
+++ b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/webapi/vo/MachineEquipentInfo.java
@@ -1,4 +1,4 @@
-package org.jeecg.modules.msi.vo;
+package org.jeecg.modules.msi.webapi.vo;
import lombok.Data;
@@ -8,7 +8,7 @@
public class MachineEquipentInfo {
private String machineNo;
- private String itemCount;
+ private Integer itemCount;
private String beginTime;
private String endTime;
private List<DetailedListVo> itemList;
--
Gitblit v1.9.3