From 61d03721e35e66214937df9fab548b09fa11170b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 14:00:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java
index 4208907..9d5440a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
import java.math.BigDecimal;
@@ -37,7 +37,7 @@
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏈�杩戞搷浣滄椂闂�",index = 5,dateFormat="yyyy-MM-dd HH:mm")
+ @ExcelColumn(name="鏈�杩戞搷浣滄椂闂�",index = 5, width = 18,dateFormat="yyyy-MM-dd HH:mm")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -47,35 +47,35 @@
private String remark;
@ApiModelProperty(value = "鏃堕棿锛堝勾鏈堬級")
- @ExcelColumn(name="浣跨敤鏈堜唤",index = 2,dateFormat="yyyy-MM")
+ @ExcelColumn(name="浣跨敤鏈堜唤",index = 2, width = 12,dateFormat="yyyy-MM")
private Date timeInfo;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
private Integer sortnum;
@ApiModelProperty(value = "绫诲瀷 0鐢ㄦ按 1鐢ㄦ皵 2鐢ㄦ补 3", example = "1")
- @ExcelColumn(name="绫诲瀷",valueMapping = "0=鐢ㄦ按;1=鐢ㄦ皵;2=鐢ㄦ补;3=鐑熺;",index = 0)
+ @ExcelColumn(name="绫诲瀷",valueMapping = "0=鐢ㄦ按;1=鐢ㄦ皵;2=鐢ㄦ补;3=鐑熺;", width = 10,index = 0)
private Integer type;
@ApiModelProperty(value = "鏁伴噺 (鐢ㄧ數椤匡紝鐢ㄧ數搴︼紱 娌硅�桳锛�", example = "1")
- @ExcelColumn(name="鏁伴噺",index = 3)
+ @ExcelColumn(name="鏁伴噺",index = 3, width = 10)
private BigDecimal num;
@ApiModelProperty(value = "璇存槑")
- @ExcelColumn(name="璇存槑",index = 4)
+ @ExcelColumn(name="璇存槑",index = 4, width = 20)
private String content;
@ApiModelProperty(value = "杞︾墝鍙�")
- @ExcelColumn(name="杞︾墝鍙�",index = 1)
+ @ExcelColumn(name="杞︾墝鍙�",index = 1, width = 10)
private String carCode;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@TableField(exist = false)
- private Date startTime;
+ private String startTime;
@ApiModelProperty(value = "骞存湀鏃堕棿")
@TableField(exist = false)
private String timeInfoStr;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@TableField(exist = false)
- private Date endTime;
+ private String endTime;
}
--
Gitblit v1.9.3