From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 15:47:13 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java | 16 ----------------
1 files changed, 0 insertions(+), 16 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 e384763..a0363b0 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java
@@ -17,7 +17,6 @@
public class CompanyLoginStatisticsVO {
@ApiModelProperty(value = "鏃堕棿 yyyy-MM-dd")
-<<<<<<< HEAD
@ExcelColumn(name="鏃堕棿",width = 6,align = HorizontalAlignment.CENTER,index = 0)
private String dataDate;
@@ -31,21 +30,6 @@
@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