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

jiaosong

2023-11-07 5e1cfd9032785dbe6438c830acad294d346f2734

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

@@ -82,7 +82,7 @@

    @ApiModelProperty(value = "当前锁头编码（关联locks)")
    @ExcelColumn(name="当前锁头编码（关联locks)")
    private String lockId;
    private Integer lockId;

    @ApiModelProperty(value = "最近租借时间")
    @ExcelColumn(name="最近租借时间")