From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/EquipmentCalendarVo.java | 24 +++---------------------
1 files changed, 3 insertions(+), 21 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 cd9e110..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,28 +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