From 2b287056e2f59518888d05a1bbc7e5a55fbd84d5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 15 十月 2025 10:35:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
index ade110e..8bc6458 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
@@ -72,7 +72,7 @@
     @ExcelColumn(name="鐘舵�� 0姝e父 1绂佺敤")
     private Integer status;
     @ApiModelProperty(value = "绫诲瀷  0鏁存墭鐩� 1鏁d欢", example = "1")
-    @ExcelColumn(name="绫诲瀷  0鏁存墭鐩� 1鏁d欢")
+    @ExcelColumn(name="绫诲瀷  0鏁d欢 1鏁d欢")
     private Integer type;
     @ApiModelProperty(value = "鏈堝彴鐘舵�� 0-鏃犺溅 1-鏈夎溅 2-瓒呮椂鍋滈潬 3-閿欒鍋滈潬", example = "1")
     @ExcelColumn(name="鏈堝彴鐘舵�� 0-鏃犺溅 1-鏈夎溅 2-瓒呮椂鍋滈潬 3-閿欒鍋滈潬")
@@ -94,9 +94,12 @@
     @ExcelColumn(name="宸ヤ綔缁撴潫鏃堕棿")
     private String endTime;
 
-    @ApiModelProperty(value = "鍚屾椂浣滀笟鏁伴噺", example = "1")
-    @ExcelColumn(name="鍚屾椂浣滀笟鏁伴噺")
+    @ApiModelProperty(value = "鍚屾椂鍙彿鏁伴噺", example = "1")
+    @ExcelColumn(name="鍚屾椂鍙彿鏁伴噺")
     private Integer workingNum;
+    @ApiModelProperty(value = "鍚屾椂鍑嗗鍙彿鏁伴噺", example = "1")
+    @ExcelColumn(name="鍚屾椂鍑嗗鍙彿鏁伴噺")
+    private Integer callReadyNum;
 
     @ApiModelProperty(value = "浣滀笟瓒呮椂鎶ヨ鏃堕棿(绉掞級", example = "1")
     @ExcelColumn(name="浣滀笟瓒呮椂鎶ヨ鏃堕棿(绉掞級")

--
Gitblit v1.9.3