From 051abca66db233f5dbde3f69aa706422e1ac9fd9 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 16:41:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/services/src/main/java/com/doumee/dao/business/model/Sites.java |    9 +++------
 1 files changed, 3 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 5a9e7dc..a969ae0 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
@@ -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