From 42ffad01769b4c57c76d3ee9f3a69463889f9813 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期五, 22 十一月 2024 18:20:36 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolPoint.java | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolPoint.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolPoint.java index 451de6c..e1e0d05 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolPoint.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolPoint.java @@ -1,7 +1,9 @@ package com.doumee.dao.business.model; +import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; import com.doumee.core.model.LoginUserModel; +import com.doumee.dao.system.model.Multifile; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; @@ -10,6 +12,7 @@ import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; +import java.util.List; /** * 杩愮淮宸℃鐐逛俊鎭〃 @@ -76,4 +79,39 @@ @ExcelColumn(name="鍦板潃") private String addr; + @ApiModelProperty(value = "缂栫爜") + @ExcelColumn(name="缂栫爜") + private String code; + + @ApiModelProperty(value = "缁忓害") + @ExcelColumn(name="缁忓害") + private String longitude; + + @ApiModelProperty(value = "绾害") + @ExcelColumn(name="绾害") + private String latitude; + + @ApiModelProperty(value = "鍐呭") + @ExcelColumn(name="鍐呭") + private String content; + + @ApiModelProperty(value = "宸℃璁惧锛堝叧鑱� yw_device锛�", example = "1") + @ExcelColumn(name="宸℃璁惧锛堝叧鑱� yw_device锛�") + private Integer deviceId; + + @ApiModelProperty(value = "鍖哄煙鍚嶇О") + @TableField(exist = false) + private String areaName; + + @ApiModelProperty(value = "璁惧鍚嶇О") + @TableField(exist = false) + private String deviceName; + + @ApiModelProperty(value = "闄勪欢淇℃伅") + @TableField(exist = false) + private Multifile multifile; + + @ApiModelProperty(value = "杩囨护鏁版嵁") + @TableField(exist = false) + private List<Integer> idLists; } -- Gitblit v1.9.3