From 16772c5dc27772c2eee57d2eab061ad15e8ad87e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 29 二月 2024 11:43:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 569d570..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
@@ -52,8 +52,8 @@
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "璁惧埆鍚�")
- @ExcelColumn(name="璁惧埆鍚�")
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ @ExcelColumn(name="璁惧鍚嶇О")
private String name;
@ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
@@ -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