From f9691d544e62d6c04dbfe45d05a6c7bc5e004291 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十二月 2023 11:52:29 +0800
Subject: [PATCH] 服务商

---
 server/services/src/main/java/com/doumee/dao/business/model/Sites.java |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 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..62a07ca 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;
 
 /**
@@ -38,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="缂栬緫浜�")
@@ -45,7 +48,7 @@
 
     @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
     @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
-    @TableLogic
+//    @TableLogic
     private Integer isdeleted;
 
     @ApiModelProperty(value = "澶囨敞")
@@ -60,9 +63,15 @@
     @ExcelColumn(name="缂栧彿")
     private String code;
 
-    @ApiModelProperty(value = "鐘舵�� 0姝e父 1绂佺敤", example = "1")
+    @ApiModelProperty(value = "鐘舵�� 0姝e父 1绂佺敤 ", example = "1")
     @ExcelColumn(name="鐘舵�� 0姝e父 1绂佺敤")
     private Integer status;
+    @ApiModelProperty(value = "鐘舵�� 0鍦ㄧ嚎 1绂荤嚎 ", example = "1")
+    @ExcelColumn(name="鐘舵�� 0鍦ㄧ嚎 1绂荤嚎")
+    private Integer online;
+    @ApiModelProperty(value = "鏄惁寮傚父涓婃姤 0鏄� 1鍚� ", example = "1")
+    @ExcelColumn(name="鏄惁寮傚父涓婃姤 0鏄� 1鍚�")
+    private Integer needNotice;
 
     @ApiModelProperty(value = "閿佸ご鏁伴噺", example = "1")
     @ExcelColumn(name="閿佸ご鏁伴噺")
@@ -76,4 +85,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