From 4a50bd93dfcdedb85f117d25f89e67291eb65cf7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 14 Oct 2023 10:55:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-job/src/main/java/com/moral/api/entity/Device.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/entity/Device.java b/screen-job/src/main/java/com/moral/api/entity/Device.java
index f055d6b..ddfb10d 100644
--- a/screen-job/src/main/java/com/moral/api/entity/Device.java
+++ b/screen-job/src/main/java/com/moral/api/entity/Device.java
@@ -1,11 +1,14 @@
package com.moral.api.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -19,6 +22,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
+@JsonIgnoreProperties(ignoreUnknown = true)
public class Device extends Model<Device> {
private static final long serialVersionUID = 1L;
@@ -107,16 +111,19 @@
/**
* ������(������)������
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
/**
* ������������
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
/**
* ������������
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date installTime;
/**
@@ -129,10 +136,19 @@
*/
private String extend;
+ /**
+ * ���������������code
+ */
+ private Integer townCode;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
+ /*
+ * ������������
+ * */
+ @TableField(exist = false)
+ private Version version;
+ /*
+ *������
+ * */
+ private Integer devNum;
}
--
Gitblit v1.8.0