Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-10-18 d9ac23d230291d737b67a5bf23ac41dea20778c0

 server/services/src/main/java/com/doumee/dao/business/model/Locks.java

@@ -82,7 +82,7 @@
    private String bikeType;

    @ApiModelProperty(value = "当前锁定自行车编号")
    @TableField(select = false)
    @TableField(exist  = false)
    private Sites sites;

}