From 48bf9371a65ad93faebfc95002f43d49d27faf84 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 26 十一月 2024 16:29:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolLine.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolLine.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolLine.java
index c598dff..48a9942 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolLine.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolLine.java
@@ -1,6 +1,8 @@
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -9,6 +11,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 杩愮淮宸℃璺嚎淇℃伅琛�
@@ -18,7 +21,7 @@
@Data
@ApiModel("杩愮淮宸℃璺嚎淇℃伅琛�")
@TableName("`yw_patrol_line`")
-public class YwPatrolLine {
+public class YwPatrolLine extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -67,4 +70,12 @@
@ExcelColumn(name="鍥炬爣")
private String imgurl;
+ @ApiModelProperty(value = "宸℃鐐规暟閲�")
+ @TableField(exist = false)
+ private Integer lineAmount;
+
+ @ApiModelProperty(value = "宸℃鐐�")
+ @TableField(exist = false)
+ private List<YwLinePoint> linePointList;
+
}
--
Gitblit v1.9.3