From bdd0875d4b13a3f1ef472f64d4b6a95e0ef64b22 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期六, 19 八月 2023 10:30:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/develop'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/EquipmentCalendarVo.java | 20 +++-----------------
1 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/EquipmentCalendarVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/EquipmentCalendarVo.java
index 271c269..1a4fef1 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/EquipmentCalendarVo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/EquipmentCalendarVo.java
@@ -4,6 +4,7 @@
import lombok.Data;
import java.time.LocalDate;
+import java.util.List;
/**
* @author: LiuS
@@ -13,24 +14,9 @@
public class EquipmentCalendarVo {
private String equipmentId;
- /*寮�濮嬫椂闂�*/
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
- private LocalDate takeEffectDate;
- /*缁撴潫鏃堕棿*/
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
- private LocalDate invalidDate;
- private String monShiftId;
+ private List<String> dateList;
- private String tueShiftId;
+ private String shiftId;
- private String wedShiftId;
-
- private String thuShiftId;
-
- private String friShiftId;
-
- private String satShiftId;
-
- private String sunShiftId;
}
--
Gitblit v1.9.3