Merge remote-tracking branch 'origin/master'

jiangping

2024-07-15 38258882c68bbfe0fef20c56e95a1766e4f2df23

 server/service/src/main/java/com/doumee/dao/business/model/Users.java

@@ -150,6 +150,14 @@
    @ExcelColumn(name="企业二维码图片地址")
    private String companyQrcodeImg;

    @ApiModelProperty(value = "中台临时票据过期时间")
    @ExcelColumn(name="中台临时票据过期时间")
    private Date tokenDate;

    @ApiModelProperty(value = "中台临时票据")
    @ExcelColumn(name="中台临时票据")
    private String token;

    @ApiModelProperty(value = "邮箱")
    @ExcelColumn(name="邮箱")
    private String email;