From a6d6627a6e13aef60941337a270541f507d53ba7 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 15 十二月 2023 09:36:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java | 2 +- 1 files changed, 1 insertions(+), 1 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 9d52473..9f9dab2 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 @@ -188,7 +188,7 @@ @ApiModelProperty(value = "鐧藉悕鍗曞崟鍙�") @ExcelColumn(name="鐧藉悕鍗曞崟鍙�") @TableField("ext_event_white_list_no") - private String extEventWhiteListNo; + private Integer extEventWhiteListNo; @ApiModelProperty(value = "浜嬩欢涓婃姤椹卞姩鐨勬椂闂�") @ExcelColumn(name="浜嬩欢涓婃姤椹卞姩鐨勬椂闂�") -- Gitblit v1.9.3