From f3c59a17062fb0a89b5f89b7845341386952a6b1 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 24 九月 2025 16:01:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 05a3247..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
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import com.doumee.dao.web.response.PlatformWorkVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -65,10 +64,16 @@
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
private String remark;
+ @ApiModelProperty(value = "led绌洪棽鏂囨")
+ @ExcelColumn(name="led绌洪棽鏂囨")
+ private String ledContent;
@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 type;
@ApiModelProperty(value = "鏈堝彴鐘舵�� 0-鏃犺溅 1-鏈夎溅 2-瓒呮椂鍋滈潬 3-閿欒鍋滈潬", example = "1")
@ExcelColumn(name="鏈堝彴鐘舵�� 0-鏃犺溅 1-鏈夎溅 2-瓒呮椂鍋滈潬 3-閿欒鍋滈潬")
private Integer platformStatus;
@@ -89,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="浣滀笟瓒呮椂鎶ヨ鏃堕棿(绉掞級")
@@ -143,6 +151,7 @@
@ApiModelProperty(value = "瑙掑害", example = "1")
@ExcelColumn(name="瑙掑害")
private BigDecimal angle;
+
@ApiModelProperty(value = "鏈堝彴浣滀笟鏁堢巼锛堜竾鏀�/灏忔椂锛�", example = "1")
@ExcelColumn(name="鏈堝彴浣滀笟鏁堢巼锛堜竾鏀�/灏忔椂锛�")
private BigDecimal workRate;
--
Gitblit v1.9.3