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/JkSketch.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketch.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketch.java
index 38b8f3e..ee0a482 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketch.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketch.java
@@ -92,6 +92,9 @@
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
//@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
+ @ApiModelProperty(value = "浼樺寲鐘舵�� 0鏈紭鍖� 1宸茬敓鎴愬凡浼樺寲绾胯矾", example = "1")
+ //@ExcelColumn(name="鎺掑簭鐮�")
+ private Integer optStatus;
@ApiModelProperty(value = "浼樺寲璁板綍缂栫爜(浣滀负key鍊煎瓨redis锛�", example = "1")
//@ExcelColumn(name="鐝粍缂栫爜锛堝叧鑱攃ategory锛�")
private String jobId;
@@ -118,6 +121,9 @@
@ApiModelProperty(value = "绾胯矾闆嗗悎", example = "1")
@TableField(exist = false)
List<JkLine> lineList;
+ @ApiModelProperty(value = "绾胯矾闆嗗悎(璋冩暣鍚庯級", example = "1")
+ @TableField(exist = false)
+ List<JkSketchLine> sketchLineList;
@ApiModelProperty(value = "绾胯矾缂栫爜闆嗗悎", example = "1")
@TableField(exist = false)
List<Integer> lineIdList;
--
Gitblit v1.9.3