From 17efddc6a667670dca682bf36b51a43e99615e6d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 十月 2024 15:59:38 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
index 39632b7..a2a7574 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,7 +20,7 @@
@Data
@ApiModel("闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃")
@TableName("`device_event`")
-public class DeviceEvent {
+public class DeviceEvent extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -32,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +41,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -270,9 +269,15 @@
@TableField(exist = false)
private String companyName;
- @ApiModelProperty(value = "浜哄憳绫诲瀷")
+// @ApiModelProperty(value = "浜哄憳绫诲瀷 0=鐩稿叧鏂癸紱1=璁垮浜哄憳锛�2=鍐呴儴浜哄憳")
+// @TableField(exist = false)
+// private Integer personType;
+
+
+
+ @ApiModelProperty(value = "浜哄憳绫诲瀷 0=鐩稿叧鏂癸紱1=璁垮浜哄憳锛�2=鍐呴儴浜哄憳")
@TableField(exist = false)
- private String personType;
+ private Integer queryUserType;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@TableField(exist = false)
--
Gitblit v1.9.3