From 38779e77618d173ee31fb5b10161140af64b7058 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 02 十一月 2023 17:06:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/dao/business/model/Sites.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 5a9e7dc..33317cf 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
@@ -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,7 +48,7 @@
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
@ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
- @TableLogic
+// @TableLogic
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
@@ -59,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="閿佸ご鏁伴噺")
@@ -75,15 +82,12 @@
@ExcelColumn(name="鐗堟湰鍙�")
private String clientVersion;
-
-
- @ApiModelProperty(value = "閿佹鍣ㄦ暟")
- @TableField(exist = false)
- private Integer localCount;
-
@ApiModelProperty(value = "鍦ㄦ灦杞﹁締鏁�")
@TableField(exist = false)
private Integer bikeCount;
+ @ApiModelProperty(value = "鍦ㄦ灦杞﹁締鏁�")
+ @TableField(exist = false)
+ private Integer allLockNum;
@ApiModelProperty(value = "婊℃灦鐜�")
@TableField(exist = false)
--
Gitblit v1.9.3