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/JkSketchLine.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchLine.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchLine.java
index 3361816..a418b93 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchLine.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchLine.java
@@ -13,6 +13,7 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* 浜ゆ帶-绾胯矾浼樺寲绾胯矾璁板綍淇℃伅琛�
@@ -58,6 +59,9 @@
@ApiModelProperty(value = "绾胯矾缂栫爜锛堝叧鑱攋k_line)", example = "1")
@ExcelColumn(name="绾胯矾缂栫爜锛堝叧鑱攋k_line)")
private Integer lineId;
+ @ApiModelProperty(value = "璺▼鏁�", example = "1")
+ @ExcelColumn(name="璺▼鏁�")
+ private Long distance;
@ApiModelProperty(value = "绾胯矾浼樺寲缂栫爜锛堝叧鑱攋k_sketch)", example = "1")
@ExcelColumn(name="绾胯矾浼樺寲缂栫爜锛堝叧鑱攋k_sketch)")
@@ -74,6 +78,8 @@
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
+ @ApiModelProperty(value = "绫诲瀷 0浼樺寲鍓� 1浼樺寲鍚�", example = "1")
+ private Integer type;
@ApiModelProperty(value = "鏃ユ湡")
@ExcelColumn(name="鏃ユ湡")
@@ -81,6 +87,8 @@
private Date dateInfo;
+ @ApiModelProperty(value = "浜ら�氳鍒掓槑缁嗭紙json鏁扮粍闆嗗悎锛�", example = "1")
+ private String steps;
@ApiModelProperty(value = "杞︾墝鍙�", example = "1")
@TableField(exist = false)
private String carCode;
@@ -96,5 +104,16 @@
@ApiModelProperty(value = "鎵�灞炰富绾胯矾缂栫爜", example = "1")
@TableField(exist = false)
private Integer categoryId;
+ @ApiModelProperty(value = "瀹㈡埛鏄庣粏", example = "1")
+ @TableField(exist = false)
+ private List<JkSketchCustomer> customerList;
+
+ @ApiModelProperty(value = "鏈�澶у鎴烽噺", example = "1")
+ @TableField(exist = false)
+ private Integer maxCustomer;
+
+ @ApiModelProperty(value = "鏈�澶ц鍗曢噺", example = "1")
+ @TableField(exist = false)
+ private Integer maxOrder;
}
--
Gitblit v1.9.3