From cb6874174975a370cb60f1557704c9d49a05f9e6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 05 一月 2024 08:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java | 6 ++++++
1 files changed, 6 insertions(+), 0 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 4226cb0..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
@@ -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