From 6ef869b1adcf3a5bb8e4c3117dc507d173f13fd8 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 18 九月 2024 15:19:55 +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/Cars.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
index 5707e3d..c8b8d0b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
@@ -87,7 +87,6 @@
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
@ApiModelProperty(value = "褰掑睘浜虹紪鐮�", example = "1")
@@ -105,6 +104,10 @@
@ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1")
@ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
private Integer status;
+
+ @ApiModelProperty(value = "鐘舵�� 0涓嶅湪鍥� 1鍦ㄥ洯", example = "1")
+ @ExcelColumn(name="鐘舵�� 0涓嶅湪鍥� 1鍦ㄥ洯")
+ private Integer inStatus;
@ApiModelProperty(value = "鎺堟潈鐘舵�� 0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鎺堟潈鐘舵�� 0鍚� 1鏄�")
private Integer authStatus;
@@ -114,8 +117,8 @@
@ExcelColumn(name="鎵�灞炲垎缁勭紪鐮侊紙鍏宠仈car_group)")
private Integer groupId;
- @ApiModelProperty(value = "绫诲瀷 0鍛樺伐杞﹁締 1瀹夋嘲鍏姟杞� 2鑷湁鐗╂祦杞�3澶栧崗鐗╂祦杞� 4甯傚叕鍙哥墿娴佽溅 5甯傚叕鍙告敞鍐岃溅杈�", example = "1")
- @ExcelColumn(name="绫诲瀷 0鍛樺伐杞﹁締 1瀹夋嘲鍏姟杞� 2鑷湁鐗╂祦杞�3澶栧崗鐗╂祦杞� 4甯傚叕鍙哥墿娴佽溅 5甯傚叕鍙告敞鍐岃溅杈�")
+ @ApiModelProperty(value = "绫诲瀷 0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠", example = "1")
+ @ExcelColumn(name="绫诲瀷 0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠")
private Integer type;
@@ -163,6 +166,9 @@
@ApiModelProperty(value = "杞︿富鎺堟潈鐘舵��", example = "1")
@TableField(exist = false)
private Integer memberAuthStatus;
+ @ApiModelProperty(value = "褰撳墠浣滀笟鏁伴噺", example = "1")
+ @TableField(exist = false)
+ private int jobNum;
@ApiModelProperty(value = "鎺堟潈鍋滆溅鍦虹紪鐮侀泦鍚�", example = "1")
@TableField(exist = false)
--
Gitblit v1.9.3