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

luodangjia

2024-07-23 9af336a5be2483d67b5dbbf02d87e1e54185014f

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivity.java

@@ -55,7 +55,6 @@
    private Date endTime;

    private Integer companyType;
    private String offline;

    public Integer getCompanyType() {
        return companyType;