From 9f4c4e77bd7936645d174f21a6abf8951b533e8d Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 18 一月 2022 17:51:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/java/com/sandu/ximon/dao/domain/LampMission.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/LampMission.java b/dao/src/main/java/com/sandu/ximon/dao/domain/LampMission.java
index be2be2f..f5e5894 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/LampMission.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/LampMission.java
@@ -17,8 +17,9 @@
@TableId(type = IdType.AUTO)
private Long id;
- private String userName;
+ private Long userId;
+ /*浠诲姟鎵ц澶╂暟*/
@TableField(typeHandler = JsonIntegerArrayTypeHandler.class)
private Integer[] weeks;
@@ -26,18 +27,22 @@
private Double initial;
/** 寮�鐏椂闂� */
- @JsonFormat(pattern = " HH:mm:ss")
+ // @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+ //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss,timezone = \"GMT+8")
+ //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="HH:mm")
private LocalDateTime onTime;
/** 鍏崇伅鏃堕棿 */
- @JsonFormat(pattern = " HH:mm:ss")
+ // @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+ //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss,timezone = \"GMT+8")
+ //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="HH:mm")
private LocalDateTime offTime;
/**
* 浜害璋冭妭
*/
- private List<LightAdjust> adjusts;
+ // private List<LightAdjust> adjusts;
}
--
Gitblit v1.9.3