From a69578ed877252e70d45d4753258b3d7b6937606 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:24:34 +0800
Subject: [PATCH] a
---
server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 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 a0363b0..e384763 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java
@@ -17,6 +17,7 @@
public class CompanyLoginStatisticsVO {
@ApiModelProperty(value = "鏃堕棿 yyyy-MM-dd")
+<<<<<<< HEAD
@ExcelColumn(name="鏃堕棿",width = 6,align = HorizontalAlignment.CENTER,index = 0)
private String dataDate;
@@ -30,6 +31,21 @@
@ApiModelProperty(value = "鐧诲綍娆℃暟")
@ExcelColumn(name="鐧诲綍娆℃暟",width = 6,align = HorizontalAlignment.CENTER,index = 3)
+=======
+ @ExcelColumn(name="鏃堕棿",width = 6,align = HorizontalAlignment.CENTER)
+ private String dataDate;
+
+ @ApiModelProperty(value = "鐧诲綍浼佷笟鍚嶇О")
+ @ExcelColumn(name="鐧诲綍浼佷笟鍚嶇О",width = 6,align = HorizontalAlignment.CENTER)
+ private String companyName;
+
+ @ApiModelProperty(value = "娓犻亾")
+ @ExcelColumn(name="娓犻亾", valueMapping = "0=PC骞冲彴;1=閽夐拤骞冲彴;2=缇氱緤骞冲彴;3=EDGP骞冲彴;4=寰俊灏忕▼搴�",width = 6,align = HorizontalAlignment.CENTER)
+ private Integer orgin;
+
+ @ApiModelProperty(value = "鐧诲綍娆℃暟")
+ @ExcelColumn(name="鐧诲綍娆℃暟",width = 6,align = HorizontalAlignment.CENTER)
+>>>>>>> 1.0.3
private Integer loginNum;
}
--
Gitblit v1.9.3