From da5df77bf60dcc9a67d5560a210fea96d225133f Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 12 十一月 2025 11:49:21 +0800
Subject: [PATCH] 简道云对接

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
index c0fa8a7..9c9270e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
@@ -2,7 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
 import com.doumee.dao.business.vo.ApproveDataVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,7 +10,7 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
 import java.util.List;
 
@@ -115,9 +115,14 @@
     private String cancelInfo;
 
     @ApiModelProperty(value = "鐩殑鍦扮被鍨� 0甯傚唴鐢ㄨ溅 1甯傚鐢ㄨ溅", example = "1")
-    //@ExcelColumn(name="鐩殑鍦扮被鍨� 0甯傚唴鐢ㄨ溅 1甯傚鐢ㄨ溅")
-    @ExcelColumn(name="鐩殑鍦扮被鍨�",index =8,width = 5,valueMapping = "0=甯傚唴鐢ㄨ溅;1=甯傚鐢ㄨ溅")
+    //@ExcelColumn(name="鐩殑鍦扮被鍨� 0甯傚唴鐢ㄨ溅 1甯傚鐢ㄨ溅") 
     private Integer type;
+
+
+    @ApiModelProperty(value = "鐩殑鍦扮被鍨嬫弿杩�", example = "1")
+    //@ExcelColumn(name="鐩殑鍦扮被鍨� 0甯傚唴鐢ㄨ溅 1甯傚鐢ㄨ溅")
+    @ExcelColumn(name="鐩殑鍦扮被鍨�",index =8,width = 5)
+    private String typeInfo;
 
     @ApiModelProperty(value = "涔樿溅浜虹紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑", example = "1")
     //@ExcelColumn(name="涔樿溅浜虹紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑")
@@ -144,6 +149,15 @@
     @ApiModelProperty(value = "鍙告満缂栫爜锛堝叧鑱攎emberId锛�", example = "1")
     //@ExcelColumn(name="鍙告満缂栫爜锛堝叧鑱攎emberId锛�")
     private Integer driverId;
+
+    @ApiModelProperty(value = "閽夐拤寰呭姙浠诲姟涓婚敭")
+    private String ddToDoId;
+
+    @ApiModelProperty(value = "閽夐拤寰呭姙浠诲姟褰掑睘浜轰富閿�")
+    private String ddBelongToUnionId;
+
+    @ApiModelProperty(value = "绠�閬撲簯涓氬姟涓婚敭")
+    private String jdyId;
 
     @ApiModelProperty(value = "鍙告満濮撳悕", example = "1")
     @TableField(exist = false)
@@ -183,4 +197,9 @@
     @ApiModelProperty(value = "瀹℃壒淇℃伅鏁版嵁")
     @TableField(exist = false)
     private ApproveDataVO approveDateVO;
+
+    @ApiModelProperty(value = "鏄惁鍏锋湁鎿嶄綔鏉冮檺(鎾ゅ洖锛�")
+    @TableField(exist = false)
+    private Integer  hasRole ;
+
 }

--
Gitblit v1.9.3