解决合并冲突

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/PublicController.java

 package com.github.wxiaoqi.security.admin.rest;
 
 import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
+import com.github.wxiaoqi.security.admin.biz.BaseUserMemberBiz;
 import com.github.wxiaoqi.security.admin.biz.MenuBiz;
 import com.github.wxiaoqi.security.admin.biz.UserBiz;
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
@@ -78,7 +79,7 @@ public class PublicController {
         Integer userid = Integer.parseInt(username);
         //获取用户基础信息
         AppUserVo userVo = detailBiz.getUserInfoById(userid);
-        if (user == null) {
+        if (userVo == null) {
             throw new BaseException(ResultCode.NOTEXIST_CODE);
         }
         BeanUtils.copyProperties(userDTO,userVo);

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehiclePageQueryVo.java

@@ -128,82 +128,4 @@ public class VehiclePageQueryVo {
      */
     private Integer haveViolation;
 
-
-    /**
-     * 所属大区
-     */
-    private Integer zoneId;
-
-
-//    public Integer getMileageRangeStart() {
-//        return mileageRangeStart;
-//    }
-//
-//    public void setMileageRangeStart(Integer mileageRangeStart) {
-//        this.mileageRangeStart = mileageRangeStart;
-//    }
-//
-//    public Integer getMileageRangeEnd() {
-//        return mileageRangeEnd;
-//    }
-//
-//    public void setMileageRangeEnd(Integer mileageRangeEnd) {
-//        this.mileageRangeEnd = mileageRangeEnd;
-//    }
-//
-//    public Integer getInsuranceCompany() {
-//        return insuranceCompany;
-//    }
-//
-//    public void setInsuranceCompany(Integer insuranceCompany) {
-//        this.insuranceCompany = insuranceCompany;
-//    }
-//
-//    public Date getInsuranceDateRangeStart() {
-//        return insuranceDateRangeStart;
-//    }
-//
-//    public void setInsuranceDateRangeStart(Date insuranceDateRangeStart) {
-//        this.insuranceDateRangeStart = insuranceDateRangeStart;
-//    }
-//
-//    public Date getInsuranceDateRangeEnd() {
-//        return insuranceDateRangeEnd;
-//    }
-//
-//    public void setInsuranceDateRangeEnd(Date insuranceDateRangeEnd) {
-//        this.insuranceDateRangeEnd = insuranceDateRangeEnd;
-//    }
-//
-//    public Date getaVRangeDateStart() {
-//        return aVRangeDateStart;
-//    }
-//
-//    public void setaVRangeDateStart(Date aVRangeDateStart) {
-//        this.aVRangeDateStart = aVRangeDateStart;
-//    }
-//
-//    public Date getaVRangeDateEnd() {
-//        return aVRangeDateEnd;
-//    }
-//
-//    public void setaVRangeDateEnd(Date aVRangeDateEnd) {
-//        this.aVRangeDateEnd = aVRangeDateEnd;
-//    }
-//
-//    public Date getmRangeDateStart() {
-//        return mRangeDateStart;
-//    }
-//
-//    public void setmRangeDateStart(Date mRangeDateStart) {
-//        this.mRangeDateStart = mRangeDateStart;
-//    }
-//
-//    public Date getmRangeDateEnd() {
-//        return mRangeDateEnd;
-//    }
-//
-//    public void setmRangeDateEnd(Date mRangeDateEnd) {
-//        this.mRangeDateEnd = mRangeDateEnd;
-//    }
 }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleDepartureLogMapper.xml

@@ -119,4 +119,4 @@
             ) t
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>