From 7843fdc7070c1fbec7aa4396685a3ea848a7fed4 Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期四, 26 十月 2023 14:02:40 +0800 Subject: [PATCH] # excel导出调整 --- server/services/src/main/java/com/doumee/dao/business/model/Sites.java | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Sites.java b/server/services/src/main/java/com/doumee/dao/business/model/Sites.java index 1189cd1..f7b0b64 100644 --- a/server/services/src/main/java/com/doumee/dao/business/model/Sites.java +++ b/server/services/src/main/java/com/doumee/dao/business/model/Sites.java @@ -1,14 +1,13 @@ package com.doumee.dao.business.model; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import com.doumee.core.annotation.excel.ExcelColumn; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; + +import java.math.BigDecimal; import java.util.Date; /** @@ -45,7 +44,7 @@ @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1") @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�") - @TableLogic +// @TableLogic private Integer isdeleted; @ApiModelProperty(value = "澶囨敞") @@ -76,4 +75,15 @@ @ExcelColumn(name="鐗堟湰鍙�") private String clientVersion; + @ApiModelProperty(value = "鍦ㄦ灦杞﹁締鏁�") + @TableField(exist = false) + private Integer bikeCount; + @ApiModelProperty(value = "鍦ㄦ灦杞﹁締鏁�") + @TableField(exist = false) + private Integer allLockNum; + + @ApiModelProperty(value = "婊℃灦鐜�") + @TableField(exist = false) + private BigDecimal rate; + } -- Gitblit v1.9.3