bug

jiangping

2023-11-07 64b432916af9c9218ab3f3eca614e26c542142ae

 server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java

@@ -17,8 +17,6 @@
public class CompanyLoginStatisticsVO {

    @ApiModelProperty(value = "时间 yyyy-MM-dd")
<<<<<<< HEAD
<<<<<<< HEAD
    @ExcelColumn(name="时间",width = 6,align = HorizontalAlignment.CENTER,index = 0)
    private String dataDate;

@@ -32,28 +30,6 @@

    @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;

}