Merge remote-tracking branch 'origin/master'

yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglPageReqVO.java

@@ -31,7 +31,7 @@ public class ClglPageReqVO extends PageParam {
     private Integer carType;
 
     @Schema(description = "驾驶员")
-    private Integer carDriver;
+    private String carDriver;
 
     @Schema(description = "用车开始时间")
     private LocalDateTime carStart;

yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglRespVO.java

@@ -40,7 +40,7 @@ public class ClglRespVO {
 
     @Schema(description = "驾驶员", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("驾驶员")
-    private Integer carDriver;
+    private String carDriver;
 
     @Schema(description = "用车开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("用车开始时间")

yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglSaveReqVO.java

@@ -31,7 +31,7 @@ public class ClglSaveReqVO {
 
     @Schema(description = "驾驶员", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "驾驶员不能为空")
-    private Integer carDriver;
+    private String carDriver;
 
     @Schema(description = "用车开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "用车开始时间不能为空")

yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/clgl/ClglDO.java

@@ -68,7 +68,7 @@ public class ClglDO extends BaseDO {
     /**
      * 驾驶员
      */
-    private Integer carDriver;
+    private String carDriver;
     /**
      * 用车开始时间
      */