From 6765787baa5e0b771d71f865c4deb776367410c4 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 13 八月 2024 13:38:19 +0800 Subject: [PATCH] 修复bug --- server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java | 40 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 38 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..43410d8 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") @@ -76,6 +76,9 @@ @ApiModelProperty(value = "绫诲瀷 0闂ㄧ 1杞﹀簱", example = "1") @ExcelColumn(name="绫诲瀷 0闂ㄧ 1杞﹀簱") private Integer type; + @ApiModelProperty(value = "鏄惁鍥尯鍑哄叆鍙� 0涓嶆槸 1鏄�", example = "1") + @ExcelColumn(name="鏄惁鍥尯鍑哄叆鍙� 0涓嶆槸 1鏄�") + private Integer isEntrance; @ApiModelProperty(value = "璧勬簮绫诲瀷", example = "1") @ExcelColumn(name="璧勬簮绫诲瀷") @@ -88,10 +91,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="鍘傚晢") @@ -129,4 +138,31 @@ @ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤") private Integer status; + @ApiModelProperty(value = "闂ㄧ鐐瑰尯鍩熷悕绉�") + @ExcelColumn(name="闂ㄧ鐐瑰尯鍩熷悕绉�") + private String regionName; + @ApiModelProperty(value = "闂ㄧ鐐瑰尯鍩熻矾寰勫悕绉�") + @ExcelColumn(name="闂ㄧ鐐瑰尯鍩熻矾寰勫悕绉�") + private String regionPathName; + @ApiModelProperty(value = "闂ㄧ鐐圭紪鍙�") + @ExcelColumn(name="闂ㄧ鐐圭紪鍙�") + private String doorNo; + @ApiModelProperty(value = "闂ㄧ鐐瑰畨瑁呬綅缃�") + @ExcelColumn(name="闂ㄧ鐐瑰畨瑁呬綅缃�") + private String installLocation; + @ApiModelProperty(value = "闂ㄧ鐐瑰敮涓�鐮�") + @ExcelColumn(name="闂ㄧ鐐瑰敮涓�鐮�") + private String doorId; + @ApiModelProperty(value = "闂ㄧ鐐瑰悕绉�") + @ExcelColumn(name="闂ㄧ鐐瑰悕绉�") + private String doorName; + + + + + + + + + } -- Gitblit v1.9.3