From cdd085a4900d528c2e5409b6dca719647951f0fe Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 10 三月 2025 08:53:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java
index 867fe9f..8821a42 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java
@@ -82,7 +82,6 @@
private String personPhone;
@ApiModelProperty(value = "浜哄憳绫诲瀷")
- @ExcelColumn(name="浜哄憳绫诲瀷",index = 6,width = 10,valueMapping = "0=鍔冲姟璁垮;1=鏅�氳瀹�;2=鍐呴儴浜哄憳;")
private Integer personType;
@ApiModelProperty(value = "浜哄憳韬唤璇佸彿")
@@ -96,7 +95,11 @@
private String visitCompanyName;
@ApiModelProperty(value = "缁勭粐绫诲瀷锛�0=鐩稿叧鏂癸紱1=鍐呴儴")
- private String companyType;
+ @ExcelColumn(name="浜哄憳绫诲瀷",index = 6,width = 10,valueMapping = "0=鐩稿叧鏂圭粍缁�;1=鍐呴儴浜哄憳;2=璁垮;")
+ private Integer companyType;
+
+ @ApiModelProperty(value = "杞﹁締绫诲瀷 0鍐呴儴杞﹁締 1鐩稿叧鏂硅溅杈� 2璁垮杞﹁締 3鍐呰繍鐗╂祦杞� 4澶栧崗杞﹁締 5甯傚叕鍙稿嵏璐ц溅 ")
+ private String carType;
@ApiModelProperty(value = "濮撳悕")
@ExcelColumn(name="濮撳悕",index = 7,width = 16)
--
Gitblit v1.9.3