From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/dao/business/model/Sites.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 a87698f..43ffeaf 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,13 +1,13 @@
package com.doumee.dao.business.model;
+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;
/**
@@ -37,6 +37,10 @@
@ExcelColumn(name="缂栬緫鏃堕棿")
//@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
+ @ApiModelProperty(value = "鏈�鍚庨�氳鏃堕棿")
+ @ExcelColumn(name="鏈�鍚庨�氳鏃堕棿")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
+ private Date lastLinkDate;
@ApiModelProperty(value = "缂栬緫浜�")
@ExcelColumn(name="缂栬緫浜�")
@@ -44,6 +48,7 @@
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
@ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
+// @TableLogic
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
@@ -58,9 +63,12 @@
@ExcelColumn(name="缂栧彿")
private String code;
- @ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1绂佺敤", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1绂佺敤 ", example = "1")
@ExcelColumn(name="鐘舵�� 0姝ｅ父 1绂佺敤")
private Integer status;
+ @ApiModelProperty(value = "鐘舵�� 0鍦ㄧ嚎 1绂荤嚎 ", example = "1")
+ @ExcelColumn(name="鐘舵�� 0鍦ㄧ嚎 1绂荤嚎")
+ private Integer online;
@ApiModelProperty(value = "閿佸ご鏁伴噺", example = "1")
@ExcelColumn(name="閿佸ご鏁伴噺")
@@ -74,4 +82,19 @@
@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;
+
+
+ @ApiModelProperty(value = "鍥剧墖base64")
+ @TableField(exist = false)
+ private String base64;
}
--
Gitblit v1.9.3