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

puzhibing

2024-05-06 7c26ec693561ecce9fba31ab4e83e9f30d641aad

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Car.java

@@ -69,6 +69,11 @@
    @TableField("drivingLicensePhoto")
    private String drivingLicensePhoto;
    /**
     * 行驶证到期时间
     */
    @TableField("drivingLicenseEndTime")
    private Date drivingLicenseEndTime;
    /**
     * 年检到期时间
     */
    @TableField("annualInspectionTime")
@@ -83,6 +88,11 @@
     */
    @TableField("commercialInsuranceTime")
    private Date commercialInsuranceTime;
    /**
     * 人车合影照片
     */
    @TableField("peopleAndCarsPhone")
    private String peopleAndCarsPhone;
    /**
     * 添加时间
     */
@@ -236,6 +246,14 @@
        return commercialInsuranceTime;
    }

    public String getPeopleAndCarsPhone() {
        return peopleAndCarsPhone;
    }

    public void setPeopleAndCarsPhone(String peopleAndCarsPhone) {
        this.peopleAndCarsPhone = peopleAndCarsPhone;
    }

    public void setCommercialInsuranceTime(Date commercialInsuranceTime) {
        this.commercialInsuranceTime = commercialInsuranceTime;
    }
@@ -272,6 +290,14 @@
        this.addObjectId = addObjectId;
    }

    public Date getDrivingLicenseEndTime() {
        return drivingLicenseEndTime;
    }

    public void setDrivingLicenseEndTime(Date drivingLicenseEndTime) {
        this.drivingLicenseEndTime = drivingLicenseEndTime;
    }

    @Override
    public String toString() {
        return "Car{" +