`fix`

pom.xml

@@ -92,6 +92,8 @@
     <dependencyManagement>
         <dependencies>
 
+
+
             <!-- SpringBoot的依赖配置-->
             <dependency>
                 <groupId>org.springframework.boot</groupId>

ruoyi-admin/pom.xml

@@ -17,6 +17,7 @@
 
     <dependencies>
 
+
         <!-- Mysql驱动包 -->
         <dependency>
             <groupId>com.mysql</groupId>

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/bo/TblCarDriveWarningBo.java

@@ -25,31 +25,26 @@ public class TblCarDriveWarningBo extends BaseEntity {
     /**
      * 编号
      */
-    @NotNull(message = "编号不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date cTime;
 
     /**
      * 告警内容
      */
-    @NotBlank(message = "告警内容不能为空", groups = { AddGroup.class, EditGroup.class })
     private String content;
 
     /**
      * 扩展1
      */
-    @NotBlank(message = "扩展1不能为空", groups = { AddGroup.class, EditGroup.class })
     private String ext1;
 
     /**
      * 扩展2
      */
-    @NotBlank(message = "扩展2不能为空", groups = { AddGroup.class, EditGroup.class })
     private String ext2;
 
 

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/bo/TblCarInfoBo.java

@@ -23,79 +23,66 @@ public class TblCarInfoBo extends BaseEntity {
     /**
      * 编号
      */
-    @NotNull(message = "编号不能为空", groups = { EditGroup.class })
-    private Long id;
+   private Long id;
 
     /**
      * 车牌号
      */
-    @NotBlank(message = "车牌号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String carNum;
 
     /**
      * 车类型（5座、19座）
      */
-    @NotBlank(message = "车类型（5座、19座）不能为空", groups = { AddGroup.class, EditGroup.class })
     private String carType;
 
     /**
      * 所有车载设备信息
      */
-    @NotBlank(message = "所有车载设备信息不能为空", groups = { AddGroup.class, EditGroup.class })
     private String deviceInfos;
 
     /**
      * 维修信息
      */
-    @NotBlank(message = "维修信息不能为空", groups = { AddGroup.class, EditGroup.class })
     private String repairInfo;
 
     /**
      * 保养信息
      */
-    @NotBlank(message = "保养信息不能为空", groups = { AddGroup.class, EditGroup.class })
     private String maintenanceInfo;
 
     /**
      * 保险信息
      */
-    @NotBlank(message = "保险信息不能为空", groups = { AddGroup.class, EditGroup.class })
     private String insuranceInfo;
 
     /**
      * 年检信息
      */
-    @NotBlank(message = "年检信息不能为空", groups = { AddGroup.class, EditGroup.class })
     private String inspectionInfo;
 
     /**
      * 交通事故信息
      */
-    @NotBlank(message = "交通事故信息不能为空", groups = { AddGroup.class, EditGroup.class })
     private String trafficAccidentInfo;
 
     /**
      * 违章信息
      */
-    @NotBlank(message = "违章信息不能为空", groups = { AddGroup.class, EditGroup.class })
     private String violationInfo;
 
     /**
      * 车辆变更信息
      */
-    @NotBlank(message = "车辆变更信息不能为空", groups = { AddGroup.class, EditGroup.class })
     private String changeInfo;
 
     /**
      * 扩展1
      */
-    @NotBlank(message = "扩展1不能为空", groups = { AddGroup.class, EditGroup.class })
     private String ext1;
 
     /**
      * 扩展2
      */
-    @NotBlank(message = "扩展2不能为空", groups = { AddGroup.class, EditGroup.class })
     private String ext2;
 
 

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/bo/TblCarPathBo.java

@@ -21,57 +21,48 @@ import jakarta.validation.constraints.*;
 public class TblCarPathBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * 路线名称
      */
-    @NotBlank(message = "路线名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String name;
 
     /**
      * 起止及经过站点信息（包括场站编号及路过场站的时间）
      */
-    @NotBlank(message = "起止及经过站点信息（包括场站编号及路过场站的时间）不能为空", groups = { AddGroup.class, EditGroup.class })
     private String stationList;
 
     /**
      * 车辆信息
      */
-    @NotNull(message = "车辆信息不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long carId;
 
     /**
      * 司机
      */
-    @NotNull(message = "司机不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long driverInfo;
 
     /**
      * 随车人员
      */
-    @NotNull(message = "随车人员不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long attendantInfo;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
      * 扩展
      */
-    @NotBlank(message = "扩展不能为空", groups = { AddGroup.class, EditGroup.class })
     private String ext1;
 
     /**
      * 扩展2
      */
-    @NotBlank(message = "扩展2不能为空", groups = { AddGroup.class, EditGroup.class })
     private String ext2;
 
 

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/bo/TblCarScheduleBo.java

@@ -25,31 +25,26 @@ public class TblCarScheduleBo extends BaseEntity {
     /**
      * 编号
      */
-    @NotNull(message = "编号不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * 路线信息
      */
-    @NotBlank(message = "路线信息不能为空", groups = { AddGroup.class, EditGroup.class })
     private String pathInfo;
 
     /**
      * 日期
      */
-    @NotNull(message = "日期不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date scheduleDate;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date cTime;
 
     /**
      * 跟新时间
      */
-    @NotNull(message = "跟新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date uTime;
 
 

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/bo/TblCarServiceBo.java

@@ -23,49 +23,41 @@ public class TblCarServiceBo extends BaseEntity {
     /**
      * 编号
      */
-    @NotNull(message = "编号不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * 车辆编号
      */
-    @NotNull(message = "车辆编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long carId;
 
     /**
      * 行驶里程
      */
-    @NotBlank(message = "行驶里程不能为空", groups = { AddGroup.class, EditGroup.class })
     private String mileageInfo;
 
     /**
      * 加油信息
      */
-    @NotBlank(message = "加油信息不能为空", groups = { AddGroup.class, EditGroup.class })
     private String oilInfo;
 
     /**
      * 维修信息
      */
-    @NotNull(message = "维修信息不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long repairInfo;
 
     /**
      * 检查信息
      */
-    @NotBlank(message = "检查信息不能为空", groups = { AddGroup.class, EditGroup.class })
     private String checkInfo;
 
     /**
      * 扩展1
      */
-    @NotBlank(message = "扩展1不能为空", groups = { AddGroup.class, EditGroup.class })
     private String ext1;
 
     /**
      * 扩展2
      */
-    @NotBlank(message = "扩展2不能为空", groups = { AddGroup.class, EditGroup.class })
     private String ext2;
 
 

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/bo/TblGoodsLossBo.java

@@ -21,33 +21,28 @@ import jakarta.validation.constraints.*;
 public class TblGoodsLossBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * 主题
      */
-    @NotBlank(message = "主题不能为空", groups = { AddGroup.class, EditGroup.class })
     private String title;
 
     /**
      * 内容
      */
-    @NotBlank(message = "内容不能为空", groups = { AddGroup.class, EditGroup.class })
     private String content;
 
     /**
      * 扩展1
      */
-    @NotBlank(message = "扩展1不能为空", groups = { AddGroup.class, EditGroup.class })
     private String ext1;
 
     /**
      * 扩展2
      */
-    @NotBlank(message = "扩展2不能为空", groups = { AddGroup.class, EditGroup.class })
     private String ext2;
 
 

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/bo/TblUserVacateBo.java

@@ -25,61 +25,51 @@ public class TblUserVacateBo extends BaseEntity {
     /**
      * 编号
      */
-    @NotNull(message = "编号不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * 用户信息
      */
-    @NotBlank(message = "用户信息不能为空", groups = { AddGroup.class, EditGroup.class })
     private String userInfo;
 
     /**
      * 请假开始日期
      */
-    @NotNull(message = "请假开始日期不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date startDate;
 
     /**
      * 结束日期
      */
-    @NotNull(message = "结束日期不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date endDate;
 
     /**
      * 内容描述
      */
-    @NotBlank(message = "内容描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String desc;
 
     /**
      * 状态（ 1-通过  2-拒绝  0-待处理）
      */
-    @NotNull(message = "状态（ 1-通过  2-拒绝  0-待处理）不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long status;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date cTime;
 
     /**
      * 跟新时间
      */
-    @NotNull(message = "跟新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date uTime;
 
     /**
      * 扩展1
      */
-    @NotBlank(message = "扩展1不能为空", groups = { AddGroup.class, EditGroup.class })
     private String ext1;
 
     /**
      * 扩展2
      */
-    @NotBlank(message = "扩展2不能为空", groups = { AddGroup.class, EditGroup.class })
     private String ext2;