From 5841a771d4455d25adb185b8a0637c9ba498aab2 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 21 十月 2025 15:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCustomer.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCustomer.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCustomer.java
index 9a7f912..d9f55d4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCustomer.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCustomer.java
@@ -12,6 +12,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
/**
* 浜ゆ帶-瀹㈡埛淇℃伅琛�
@@ -87,6 +89,24 @@
@ApiModelProperty(value = "鐘舵�� 0姝ｅ父 绂佺敤", example = "1")
//@ExcelColumn(name="鐘舵�� 0姝ｅ父 绂佺敤")
private Integer status;
+ @ApiModelProperty(value = "璺濈璁＄畻鐘舵�� 0鏈绠� 1宸茶绠� 2鏈畾浣�", example = "1")
+ //@ExcelColumn(name="鐘舵�� 0姝ｅ父 绂佺敤")
+ private Integer distanceStatus;
+ @ApiModelProperty(value = "瀹㈡埛闂磋窛绂婚泦鍚�", example = "1")
+ //@ExcelColumn(name="鐘舵�� 0姝ｅ父 绂佺敤")
+ private String distance;
+ @ApiModelProperty(value = "鍥尯璺濈璇ュ鎴风殑璺濈锛堢背锛�", example = "1")
+ //@ExcelColumn(name="鐘舵�� 0姝ｅ父 绂佺敤")
+ private Long startDistance;
+ @ApiModelProperty(value = "璇ュ鎴疯繑鍥炲洯鍖虹殑璺濈锛堢背锛�", example = "1")
+ //@ExcelColumn(name="鐘舵�� 0姝ｅ父 绂佺敤")
+ private Long endDistance;
+ @ApiModelProperty(value = "鍥尯璺濈璇ュ鎴风殑璺緞缁忕含搴﹂泦鍚堬紝鍒嗗彿闅斿紑", example = "1")
+ //@ExcelColumn(name="鐘舵�� 0姝ｅ父 绂佺敤")
+ private String startSteps;
+ @ApiModelProperty(value = "璇ュ鎴疯繑鍥炲洯鍖虹殑璺緞缁忕含搴﹂泦鍚堬紝鍒嗗彿闅斿紑", example = "1")
+ //@ExcelColumn(name="鐘舵�� 0姝ｅ父 绂佺敤")
+ private String endSteps;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
//@ExcelColumn(name="鎺掑簭鐮�")
@@ -110,4 +130,10 @@
@ApiModelProperty(value = "鏄惁鏂板锛� 0鍚� 1鏄�", example = "1")
@TableField(exist = false)
private int isnew;
+
+ @ApiModelProperty(value = "鍚岀彮缁勯棿瀹㈡埛浣嶇疆璺濈鏁扮粍锛孾{a:12,b:100},{a:13,b:200},...],a锛氬鎴风紪鐮侊紝b锛氫笌瀹㈡埛a涔嬮棿鐨勮窛绂�")
+ @TableField(exist = false)
+ private List<Map<String,Object>> distanceList;
+
+
}
--
Gitblit v1.9.3