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

jiaosong

2023-10-17 7ec37d4b36111c0192f2c7674b07f8dd1daf1d53

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

@@ -108,4 +108,9 @@
    @ExcelColumn(name="用户编码（关联member表）")
    private String memberId;

    @ApiModelProperty(value = "车辆类型编码（关联base_param)")
    @ExcelColumn(name="车辆类型编码（关联base_param)")
    private String typeId;


}