From 1293d3dba10c4e291dfbce4c936f952875557edb Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 18:40:49 +0800
Subject: [PATCH] 配置信息对接调整提交
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
index 2a76f72..850ff3e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
@@ -14,7 +14,7 @@
/**
* 璁惧淇℃伅琛�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("璁惧淇℃伅琛�")
@@ -52,13 +52,13 @@
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "棰樼洰")
- @ExcelColumn(name="棰樼洰")
- private String title;
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ @ExcelColumn(name="璁惧鍚嶇О")
+ private String name;
@ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
@ExcelColumn(name="娴峰悍鏍囪瘑")
- private Integer hkId;
+ private String hkId;
@ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
@ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@@ -79,7 +79,7 @@
@ApiModelProperty(value = "璧勬簮绫诲瀷", example = "1")
@ExcelColumn(name="璧勬簮绫诲瀷")
- private BigDecimal resourceType;
+ private String resourceType;
@ApiModelProperty(value = "缂栧彿")
@ExcelColumn(name="缂栧彿")
@@ -88,10 +88,16 @@
@ApiModelProperty(value = "閫氶亾鍙�")
@ExcelColumn(name="閫氶亾鍙�")
private String channelNo;
+ @ApiModelProperty(value = "閫氶亾鍚嶇О闆嗗悎")
+ @ExcelColumn(name="閫氶亾鍚嶇О闆嗗悎")
+ private String channelInfo;
@ApiModelProperty(value = "璁惧绫诲瀷缂栫爜")
@ExcelColumn(name="璁惧绫诲瀷缂栫爜")
private String devTypeCode;
+ @ApiModelProperty(value = "闂ㄧ璁惧绫诲瀷鍨嬪彿")
+ @ExcelColumn(name="闂ㄧ璁惧绫诲瀷鍨嬪彿")
+ private String devTypeDesc;
@ApiModelProperty(value = "鍘傚晢")
@ExcelColumn(name="鍘傚晢")
--
Gitblit v1.9.3