From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/DriverInfo.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/DriverInfo.java b/server/services/src/main/java/com/doumee/dao/business/model/DriverInfo.java
index 606dd65..d7c54ae 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/DriverInfo.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/DriverInfo.java
@@ -100,8 +100,8 @@
@ExcelColumn(name = "鐘舵��", index = 8, width = 8, valueMapping = "0=鍚敤锛�1=绂佺敤锛�")
private Integer status;
- @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0=寰呭鎵癸紱1=瀹℃壒閫氳繃锛�2=瀹℃壒椹冲洖", example = "0")
- @ExcelColumn(name = "瀹℃壒鐘舵��", index = 9, width = 10, valueMapping = "0=寰呭鎵癸紱1=瀹℃壒閫氳繃锛�2=瀹℃壒椹冲洖")
+ @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0=寰呭鎵癸紱1=瀹℃壒閫氳繃锛�2=瀹℃壒椹冲洖锛�3=宸叉敮浠樻娂閲戯紱99=鏈璇侊紱", example = "0")
+ @ExcelColumn(name = "瀹℃壒鐘舵��", index = 9, width = 10, valueMapping = "瀹℃壒鐘舵�侊細0=寰呭鎵癸紱1=瀹℃壒閫氳繃锛�2=瀹℃壒椹冲洖锛�3=宸叉敮浠樻娂閲戯紱99=鏈璇侊紱")
private Integer auditStatus;
@ApiModelProperty(value = "OPENID(APP)")
@@ -111,7 +111,7 @@
private String unionid;
@ApiModelProperty(value = "瀹℃壒鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date auditTime;
@ApiModelProperty(value = "瀹℃壒浜�", example = "1")
@@ -203,4 +203,34 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createTimeEnd;
+ // ---- 鐪佸競鍖轰俊鎭紙闈炴暟鎹簱瀛楁锛� ----
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐪佷唤涓婚敭")
+ private Integer provinceId;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐪佷唤鍚嶇О")
+ private String provinceName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍩庡競涓婚敭")
+ private Integer cityId;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍩庡競鍚嶇О")
+ private String cityName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍖哄幙涓婚敭")
+ private Integer districtId;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍖哄幙鍚嶇О")
+ private String districtName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "瀹℃壒浜哄悕绉�")
+ private String auditUserName;
+
}
--
Gitblit v1.9.3