From e057cdcd1132081abd02eae587850349d14fb2f7 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 07 十二月 2023 11:44:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java | 41 +++++++++--------------------------------
1 files changed, 9 insertions(+), 32 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
index 1ebe053..587fae6 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -67,26 +68,16 @@
@ExcelColumn(name="浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
private String happenTime;
- @ApiModelProperty(value = "闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜
- ")
- @ExcelColumn(name="闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜
- ")
+ @ApiModelProperty(value = "闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
+ @ExcelColumn(name="闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
private String srcIndex;
@ApiModelProperty(value = "闂ㄧ鍚嶇О")
@ExcelColumn(name="闂ㄧ鍚嶇О")
private String srcName;
- @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂
- 1-寮�濮�
- 2-鍋滄
- 4-浜嬩欢鑱斿姩缁撴灉鏇存柊
- 5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
- @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂
- 1-寮�濮�
- 2-鍋滄
- 4-浜嬩欢鑱斿姩缁撴灉鏇存柊
- 5-浜嬩欢鍥剧墖寮傛涓婁紶")
+ @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
+ @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
private Integer status;
@ApiModelProperty(value = "鑴夊啿瓒呮椂鏃堕棿锛屽崟浣嶏細绉掞紝鐬椂浜嬩欢姝ゅ瓧娈靛～0", example = "1")
@@ -141,16 +132,8 @@
@ExcelColumn(name="浜哄憳缂栧彿")
private String extEventPersonNo;
- @ApiModelProperty(value = "璇诲崱鍣ㄧ被鍒�0-鏃犳晥
- 1-IC璇诲崱鍣�
- 2-韬唤璇佽鍗″櫒
- 3-浜岀淮鐮佽鍗″櫒
- 4-鎸囩汗澶�", example = "1")
- @ExcelColumn(name="璇诲崱鍣ㄧ被鍒�0-鏃犳晥
- 1-IC璇诲崱鍣�
- 2-韬唤璇佽鍗″櫒
- 3-浜岀淮鐮佽鍗″櫒
- 4-鎸囩汗澶�")
+ @ApiModelProperty(value = "璇诲崱鍣ㄧ被鍒�0-鏃犳晥1-IC璇诲崱鍣�2-韬唤璇佽鍗″櫒3-浜岀淮鐮佽鍗″櫒4-鎸囩汗澶�", example = "1")
+ @ExcelColumn(name="璇诲崱鍣ㄧ被鍒�0-鏃犳晥1-IC璇诲崱鍣�2-韬唤璇佽鍗″櫒3-浜岀淮鐮佽鍗″櫒4-鎸囩汗澶�")
private Integer extEventReaderKind;
@ApiModelProperty(value = "璇诲崱鍣╥d", example = "1")
@@ -165,14 +148,8 @@
@ExcelColumn(name="鍥剧墖瀛樺偍鏈嶅姟鍣ㄥ敮涓�鏍囪瘑")
private String svrIndexCode;
- @ApiModelProperty(value = "鎶ュ憡涓婁紶閫氶亾,1-甯冮槻int涓婁紶
- 2-涓績缁�1涓婁紶
- 3-涓績缁�2涓婁紶
- 0-鏃犳晥", example = "1")
- @ExcelColumn(name="鎶ュ憡涓婁紶閫氶亾,1-甯冮槻int涓婁紶
- 2-涓績缁�1涓婁紶
- 3-涓績缁�2涓婁紶
- 0-鏃犳晥")
+ @ApiModelProperty(value = "鎶ュ憡涓婁紶閫氶亾,1-甯冮槻int涓婁紶2-涓績缁�1涓婁紶3-涓績缁�2涓婁紶0-鏃犳晥", example = "1")
+ @ExcelColumn(name="鎶ュ憡涓婁紶閫氶亾,1-甯冮槻int涓婁紶2-涓績缁�1涓婁紶3-涓績缁�2涓婁紶0-鏃犳晥")
private Integer extEventReportChannel;
@ApiModelProperty(value = "缇ょ粍缂栧彿", example = "1")
--
Gitblit v1.9.3