Merge branch 'hz_master' into dev

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java

@@ -217,12 +217,6 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
     public List<BranchCompany> getAll() {
         return mapper.selectAll();
     }
-    public List<BranchCompany> getCompanys() {
-        Example example=new Example(BranchCompany.class);
-        example.createCriteria().andEqualTo("state",1).andEqualTo("isShow",1).andEqualTo("isDel",0);
-        return mapper.selectByExample(example);
-    }
-
 
     /**
      * 增加公司，返回id

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/BranchCompanyController.java

@@ -90,10 +90,6 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
     public RestResponse<List<BranchCompany>> findAll(){
         return RestResponse.data(baseBiz.getAll());
     }
-    @GetMapping("/app/unauth/companyAll")
-    public RestResponse<List<BranchCompany>> companyAll(){
-        return RestResponse.data(baseBiz.getCompanys());
-    }
 
     @RequestMapping(value ="/{id}",method = RequestMethod.GET)
     public RestResponse<BranchCompany> get(@PathVariable Integer id) {