From cb221a76856b945b4501b6628cebe1815303f2f3 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 22 十月 2025 08:47:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/RetentionCarsVO.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/RetentionCarsVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/RetentionCarsVO.java
index ca80d7d..1f9b848 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/RetentionCarsVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/RetentionCarsVO.java
@@ -32,8 +32,8 @@
private String carNo;
@ApiModelProperty(value = "璁垮ID(鍏宠仈member)")
private Integer memberId;
- @ApiModelProperty(value = "杞﹁締绫诲瀷 0鍐呴儴杞﹁締 1鐩稿叧鏂硅溅杈� 2璁垮杞﹁締 3鍐呰繍鐗╂祦杞� 4澶栧崗杞﹁締 5甯傚叕鍙稿嵏璐ц溅 ")
- @ExcelColumn(name="杞﹁締绫诲瀷" ,index = 3, valueMapping="0=鍐呴儴杞﹁締;1=鐩稿叧鏂硅溅杈�;2=璁垮杞﹁締;3=鍐呰繍鐗╂祦杞�;4=澶栧崗杞﹁締;5=甯傚叕鍙稿嵏璐ц溅;",width = 8)
+ @ApiModelProperty(value = "杞﹁締绫诲瀷 0鍐呴儴杞﹁締 1鐩稿叧鏂硅溅杈� 2璁垮杞﹁締 3鍐呰繍鐗╂祦杞� 4澶栧崗杞﹁締 5甯傚叕鍙稿嵏璐ц溅;6鏈櫥璁拌溅杈� ")
+ @ExcelColumn(name="杞﹁締绫诲瀷" ,index = 3, valueMapping="0=鍐呴儴杞﹁締;1=鐩稿叧鏂硅溅杈�;2=璁垮杞﹁締;3=鍐呰繍鐗╂祦杞�;4=澶栧崗杞﹁締;5=甯傚叕鍙稿嵏璐ц溅;6=鏈櫥璁拌溅杈�",width = 8)
private Integer carType ;
@ApiModelProperty(value = "鍏徃缁勭粐")
@ExcelColumn(name="鍏徃缁勭粐" ,index = 4,width = 12)
@@ -55,4 +55,6 @@
private Date endTime;
@ApiModelProperty(value = "璁垮鍏徃鍚嶇О")
private String visitCompanyName;
+ @ApiModelProperty(value = "杞﹁締鍒嗙被")
+ private String categoryName;
}
--
Gitblit v1.9.3