From 519b464e4ed3d07bd5aa23a4067e5869058de2e5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十月 2023 13:36:51 +0800
Subject: [PATCH] 添加统计日志
---
server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java b/server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java
index 961ab91..658ec95 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java
@@ -17,19 +17,43 @@
public class CompanyLoginStatisticsVO {
@ApiModelProperty(value = "鏃堕棿 yyyy-MM-dd")
- @ExcelColumn(name="鏃堕棿",width = 6,align = HorizontalAlignment.CENTER)
+<<<<<<< HEAD
+<<<<<<< HEAD
+ @ExcelColumn(name="鏃堕棿",width = 6,align = HorizontalAlignment.CENTER,index = 0)
private String dataDate;
@ApiModelProperty(value = "鐧诲綍浼佷笟鍚嶇О")
- @ExcelColumn(name="鐧诲綍浼佷笟鍚嶇О",width = 6,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="鐧诲綍浼佷笟鍚嶇О",width = 8,align = HorizontalAlignment.CENTER,index = 1)
private String companyName;
@ApiModelProperty(value = "娓犻亾")
- @ExcelColumn(name="娓犻亾", valueMapping = "0=PC骞冲彴;1=閽夐拤骞冲彴;2=缇氱緤骞冲彴;3=EDGP骞冲彴;4=寰俊灏忕▼搴�",width = 6,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="娓犻亾", valueMapping = "0=PC骞冲彴;1=閽夐拤骞冲彴;2=缇氱緤骞冲彴;3=EDGP骞冲彴;4=寰俊灏忕▼搴�",width = 6,align = HorizontalAlignment.CENTER,index = 2)
private Integer orgin;
@ApiModelProperty(value = "鐧诲綍娆℃暟")
+ @ExcelColumn(name="鐧诲綍娆℃暟",width = 6,align = HorizontalAlignment.CENTER,index = 3)
+=======
+ @ExcelColumn(name="鏃堕棿",width = 6,align = HorizontalAlignment.CENTER)
+=======
+ @ExcelColumn(name="鏃堕棿",width = 6,align = HorizontalAlignment.CENTER,index = 0)
+>>>>>>> dev
+ private String dataDate;
+
+ @ApiModelProperty(value = "鐧诲綍浼佷笟鍚嶇О")
+ @ExcelColumn(name="鐧诲綍浼佷笟鍚嶇О",width = 8,align = HorizontalAlignment.CENTER,index = 1)
+ private String companyName;
+
+ @ApiModelProperty(value = "娓犻亾")
+ @ExcelColumn(name="娓犻亾", valueMapping = "0=PC骞冲彴;1=閽夐拤骞冲彴;2=缇氱緤骞冲彴;3=EDGP骞冲彴;4=寰俊灏忕▼搴�",width = 6,align = HorizontalAlignment.CENTER,index = 2)
+ private Integer orgin;
+
+ @ApiModelProperty(value = "鐧诲綍娆℃暟")
+<<<<<<< HEAD
@ExcelColumn(name="鐧诲綍娆℃暟",width = 6,align = HorizontalAlignment.CENTER)
+>>>>>>> 1.0.3
+=======
+ @ExcelColumn(name="鐧诲綍娆℃暟",width = 6,align = HorizontalAlignment.CENTER,index = 3)
+>>>>>>> dev
private Integer loginNum;
}
--
Gitblit v1.9.3