From c6a96d1162cb60d1bd30c8f5fde7a93985b79276 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 09 十月 2024 16:31:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 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 c8b8d0b..766948d 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
@@ -113,15 +113,17 @@
private Integer authStatus;
- @ApiModelProperty(value = "鎵�灞炲垎缁勭紪鐮侊紙鍏宠仈car_group)", example = "1")
- @ExcelColumn(name="鎵�灞炲垎缁勭紪鐮侊紙鍏宠仈car_group)")
+ @ApiModelProperty(value = "鎵�灞炵粍缁囦富閿紙鍏宠仈company)", example = "1")
+ @ExcelColumn(name="鎵�灞炵粍缁囦富閿紙鍏宠仈company)")
private Integer groupId;
@ApiModelProperty(value = "绫诲瀷 0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠", example = "1")
@ExcelColumn(name="绫诲瀷 0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠")
private Integer type;
-
+ @ApiModelProperty(value = "鎵�灞炲垎绫荤紪鐮�", example = "1")
+ @ExcelColumn(name="鎵�灞炲垎绫荤紪鐮�")
+ private Integer cateId;
@ApiModelProperty(value = "鍋滆溅鍦哄悕绉伴泦鍚�", example = "1")
@ExcelColumn(name="鍋滆溅鍦哄悕绉伴泦鍚�")
@@ -170,6 +172,28 @@
@TableField(exist = false)
private int jobNum;
+ @ApiModelProperty(value = "涓�绾у垎绫讳富閿�", example = "1")
+ @TableField(exist = false)
+ private Integer catePId;
+
+ @ApiModelProperty(value = "鍒嗙被鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String cateName;
+
+ @ApiModelProperty(value = "涓�绾у垎绫诲悕绉�", example = "1")
+ @TableField(exist = false)
+ private String catePName;
+
+ @ApiModelProperty(value = "杞﹁締閮ㄩ棬鍚嶇О", example = "1")
+ @ExcelColumn(name="杞﹁締缁勭粐閮ㄩ棬鍚嶇О")
+ @TableField(exist = false)
+ private String carCompanyName;
+
+ @ApiModelProperty(value = "杞﹁締閮ㄩ棬鍏ㄨ矾寰勫悕绉�", example = "1")
+ @ExcelColumn(name="杞﹁締閮ㄩ棬鍏ㄨ矾寰勫悕绉�")
+ @TableField(exist = false)
+ private String carCompanyNamePath;
+
@ApiModelProperty(value = "鎺堟潈鍋滆溅鍦虹紪鐮侀泦鍚�", example = "1")
@TableField(exist = false)
private List<Integer> parkIdList;
--
Gitblit v1.9.3