From c65ac3a33caee98e3314370b0a84536466701311 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 30 十月 2024 08:54:01 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java index a864f48..9119694 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java @@ -77,6 +77,9 @@ @ApiModelProperty(value = "鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�", example = "1") // @ExcelColumn(name="鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�") private Integer memberId; + @ApiModelProperty(value = "璐d换閮ㄩ棬缂栫爜锛堝叧鑱攃ompany锛�", example = "1") +// @ExcelColumn(name="鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�") + private Integer dutyCompanyId; @ApiModelProperty(value = "澶勭悊鏃堕棿") // @ExcelColumn(name="澶勭悊鏃堕棿") @@ -91,17 +94,21 @@ private Integer checkUserId; @ApiModelProperty(value = "鍖哄煙鍚嶇О") - @ExcelColumn(name="闅愭偅鍖哄煙",index = 1) + @ExcelColumn(name="闅愭偅鍖哄煙",index = 2) private String areaName; @ApiModelProperty(value = "鐢宠浜哄鍚�", example = "1") @TableField(exist = false) - @ExcelColumn(name="鎻愭姤浜哄鍚�",index = 3) + @ExcelColumn(name="鎻愭姤浜哄鍚�",index =4) private String memberName; @ApiModelProperty(value = "鐢宠浜烘墍灞炵粍缁囧悕绉�", example = "1") @TableField(exist = false) - @ExcelColumn(name="鎵�灞炵粍缁�",index = 4) + @ExcelColumn(name="鎵�灞炵粍缁�",index = 5) private String companyName; + @ApiModelProperty(value = "璐d换閮ㄩ棬鍚嶇О", example = "1") + @TableField(exist = false) + @ExcelColumn(name="璐d换閮ㄩ棬鍚嶇О",index = 1) + private String dutyCompanyName; @ApiModelProperty(value = "鐢宠浜烘墜鏈哄彿", example = "1") @TableField(exist = false) // @ExcelColumn(name="鐢宠浜烘墜鏈哄彿") @@ -120,7 +127,7 @@ private String checkorPhone; @ApiModelProperty(value = "闅愭偅绫诲瀷鍚嶇О", example = "1") @TableField(exist = false) - @ExcelColumn(name="闅愭偅绫诲瀷",index = 2) + @ExcelColumn(name="闅愭偅绫诲瀷",index = 3) private String categoryName; @ApiModelProperty(value = "鏌ヨ寮�濮嬫椂闂达紙鍩轰簬鎻愭姤鏃堕棿锛�", example = "2024-05-20 11:48:50") @@ -141,12 +148,12 @@ @ApiModelProperty(value = "鎻愭姤鏃堕棿") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ExcelColumn(name="鎻愭姤鏃堕棿",index = 5) + @ExcelColumn(name="鎻愭姤鏃堕棿",index = 6) private Date submitTime; @ApiModelProperty(value = "澶勭悊鏃堕棿锛堟暣鏀�/閫�鍥炰娇鐢級") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ExcelColumn(name="澶勭悊鏃堕棿",index = 7) + @ExcelColumn(name="澶勭悊鏃堕棿",index = 8) private Date dealTime; @ApiModelProperty(value = "闄勪欢淇℃伅") -- Gitblit v1.9.3