From 6e78d2b1b00eceac3ee6222b713f749e21428f9a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 十月 2023 09:09:07 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/dao/business/model/Sites.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 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..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
@@ -44,7 +44,7 @@
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
@ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
- @TableLogic
+// @TableLogic
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
@@ -75,15 +75,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