From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 20 十二月 2024 09:50:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java index dcb7980..09c04f0 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java @@ -87,9 +87,10 @@ @ApiModelProperty(value = "璐d换閮ㄩ棬缂栫爜锛堝叧鑱攃ompany锛�", example = "1") // @ExcelColumn(name="鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�") private Integer companyId; + @ApiModelProperty(value = "璐d换閮ㄩ棬缂栫爜", example = "1") // @ExcelColumn(name="鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�") @TableField(exist = false) - private Integer companyName; + private String companyName; } -- Gitblit v1.9.3