From 39ddb6cdeefad6489e79cd49dfa94fdaf359dcdc Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 20 五月 2024 16:57:10 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarDriver.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarDriver.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarDriver.java
index 31a6630..697a993 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarDriver.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarDriver.java
@@ -1,6 +1,8 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -18,7 +20,7 @@
@Data
@ApiModel("鍙告満淇℃伅琛�")
@TableName("`car_driver`")
-public class CarDriver {
+public class CarDriver extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -27,7 +29,7 @@
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
- private String creator;
+ private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
@@ -36,7 +38,7 @@
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@ExcelColumn(name="鏇存柊浜虹紪鐮�")
- private String edirot;
+ private Integer edirot;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
@@ -67,4 +69,15 @@
@ExcelColumn(name="浜哄憳缂栫爜锛堝叧鑱攎ember琛�)")
private Integer memberId;
+ @ApiModelProperty(value = "鍙告満濮撳悕", example = "1")
+ @TableField(exist = false)
+ private String memberName;
+ @ApiModelProperty(value = "鍙告満缁勭粐鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String companyName;
+ @ApiModelProperty(value = "鍙告満鎵嬫満鍙�", example = "1")
+ @TableField(exist = false)
+ private String memberPhone;
+
+
}
--
Gitblit v1.9.3