From 7b51c9e1abc198a501f7858599da9c116130fd6f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 16:47:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 f91e1ab..b52fa8d 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;
@@ -12,6 +11,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.util.Date;
import java.math.BigDecimal;
import java.util.List;
@@ -63,6 +64,9 @@
@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绂佺敤")
@@ -141,6 +145,7 @@
@ApiModelProperty(value = "瑙掑害", example = "1")
@ExcelColumn(name="瑙掑害")
private BigDecimal angle;
+
@ApiModelProperty(value = "鏈堝彴浣滀笟鏁堢巼锛堜竾鏀�/灏忔椂锛�", example = "1")
@ExcelColumn(name="鏈堝彴浣滀笟鏁堢巼锛堜竾鏀�/灏忔椂锛�")
private BigDecimal workRate;
@@ -188,10 +193,14 @@
private String workCarCode;
@ApiModelProperty(value = "寮�濮嬫椂闂� yyyy-MM-dd", example = "1")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@TableField(exist = false)
private Date queryDateStart;
@ApiModelProperty(value = "缁撴潫鏃堕棿 yyyy-MM-dd", example = "1")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@TableField(exist = false)
private Date queryDateEnd;
@@ -211,6 +220,8 @@
@TableField(exist = false)
private BigDecimal useRata;
+
+
@ApiModelProperty(value = "鏈堝彴浣滀笟鏁版嵁")
@TableField(exist = false)
private PlatformWorkVO platformWorkVO;
--
Gitblit v1.9.3