From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCustomerNavigation.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCustomerNavigation.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCustomerNavigation.java
index 736c75d..e431477 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCustomerNavigation.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCustomerNavigation.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -54,11 +55,11 @@
@ApiModelProperty(value = "璧峰瀹㈡埛缂栫爜锛堣捣鐐逛綅-1锛�", example = "1")
@ExcelColumn(name="璧峰瀹㈡埛缂栫爜锛堣捣鐐逛綅-1锛�")
- private Long startId;
+ private Integer startId;
@ApiModelProperty(value = "缁堢瀹㈡埛缂栫爜锛堣捣鐐逛綅-1锛�", example = "1")
@ExcelColumn(name="缁堢瀹㈡埛缂栫爜锛堣捣鐐逛綅-1锛�")
- private Long endId;
+ private Integer endId;
@ApiModelProperty(value = "璺濈锛堢背锛�", example = "1")
@ExcelColumn(name="璺濈锛堢背锛�")
@@ -68,24 +69,28 @@
@ExcelColumn(name="閫斿緞缁忕含搴﹂泦鍚堬紝鍒嗗彿闅斿紑")
private String steps;
- @ApiModelProperty(value = "缁村害", example = "1")
+ @ApiModelProperty(value = "璧风偣绾害", example = "1")
@ExcelColumn(name="缁村害")
private BigDecimal startLatitude;
- @ApiModelProperty(value = "瀹㈡埛搴忓彿", example = "1")
+ @ApiModelProperty(value = "缁堢偣绾害", example = "1")
@ExcelColumn(name="瀹㈡埛搴忓彿")
private BigDecimal endLatitude;
- @ApiModelProperty(value = "閫佽揣璺嚎缂栫爜锛堝叧鑱攋k_line)", example = "1")
- @ExcelColumn(name="閫佽揣璺嚎缂栫爜锛堝叧鑱攋k_line)")
+ @ApiModelProperty(value = "璧风偣缁忓害", example = "1")
private BigDecimal startLogitude;
- @ApiModelProperty(value = "鐘舵�� 0姝ｅ父 绂佺敤", example = "1")
- @ExcelColumn(name="鐘舵�� 0姝ｅ父 绂佺敤")
+ @ApiModelProperty(value = "缁堢偣缁忓害", example = "1")
private BigDecimal endLogitude;
@ApiModelProperty(value = "璧锋鐐笽D缁勫悎锛坰tartId-endId)")
@ExcelColumn(name="璧锋鐐笽D缁勫悎锛坰tartId-endId)")
private String idIndex;
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @TableField(exist = false)
+ private String name;
+ @ApiModelProperty(value = "瀹㈡埛鍦板潃")
+ @TableField(exist = false)
+ private String location;
}
--
Gitblit v1.9.3