From 5513e69c82a82eb6be786d5cb8e23b81bffc8636 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 10 八月 2021 09:55:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaExcelVO.java | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaExcelVO.java
index f19575d..2a3dd1a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaExcelVO.java
@@ -15,39 +15,34 @@
@Data
public class ComSwRotaExcelVO implements Serializable {
/**
- * 星期
- */
- @ExcelProperty(value = "星期" ,index = 0)
- private String weekDay;
- /**
* 时间
*/
- @ExcelProperty(value = "时间" ,index = 1)
+ @ExcelProperty(value = "时间" ,index = 0)
private String rotaDate;
-
- /**
- * 值班领导
- */
- @ExcelProperty(value = "值班领导" ,index = 2)
- private String leaderName;
-
- /**
- * 值班领导联系电话
- */
- @ExcelProperty(value = "值班领导联系电话" ,index = 3)
- private String leaderPhone;
/**
* 值班人员
*/
- @ExcelProperty(value = "值班人员(多个以逗号隔开)" ,index = 4)
+ @ExcelProperty(value = "值班人员" ,index = 1)
private String personName;
/**
* 值班人员联系电话
*/
- @ExcelProperty(value = "值班人员联系电话(多个以逗号隔开)" ,index = 5)
+ @ExcelProperty(value = "值班人员联系电话" ,index = 2)
private String personPhone;
+ /**
+ * 值班领导
+ */
+ @ExcelProperty(value = "值班领导(多个以逗号隔开)" ,index = 3)
+ private String leaderName;
+
+ /**
+ * 值班人员联系电话
+ */
+ @ExcelProperty(value = "值班领导联系电话(多个以逗号隔开)" ,index = 4)
+ private String leaderPhone;
+
}
--
Gitblit v1.7.1