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

jiaosong

2023-10-18 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f

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

@@ -75,11 +75,12 @@
    @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)