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

jiaosong

2023-10-16 aa6febca297b0e1a68b1877fc9f41885e9fc0c7a

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

@@ -67,9 +67,20 @@
    @ExcelColumn(name="站点编码(关联sites)")
    private String siteId;

    @ApiModelProperty(value = "站点编码(关联sites)")
    @ExcelColumn(name="站点编码(关联sites)")
    @TableField(select = false)
    private String siteName;

    @ApiModelProperty(value = "当前锁定自行车编号")
    @ExcelColumn(name="当前锁定自行车编号")
    private String bikeCode;

    @ApiModelProperty(value = "当前锁定自行车编号")
    @ExcelColumn(name="当前锁定自行车类型")
    @TableField(select = false)
    private String bikeType;

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