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

src/main/java/com/glxp/api/controller/basic/BasicCorpController.java

@@ -79,10 +79,10 @@ public class BasicCorpController {
         }
         List<BasicCorpEntity> basicUnitMaintainEntities;
         //是供应商的时候拉客户和供应商
-        if (basicUnitMaintainFilterRequest.getCorpType() == null || basicUnitMaintainFilterRequest.getCorpType() == 2) {
+//        if (basicUnitMaintainFilterRequest.getCorpType() == null || basicUnitMaintainFilterRequest.getCorpType() == 2) {
-            basicUnitMaintainFilterRequest.setCorpType(null);
+//            basicUnitMaintainFilterRequest.setCorpType(null);
-            basicUnitMaintainFilterRequest.setCorpTypeLists(new ArrayList<>(Arrays.asList(1, 2)));
+//            basicUnitMaintainFilterRequest.setCorpTypeLists(new ArrayList<>(Arrays.asList(1, 2)));
-        }
+//        }
         basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
         PageInfo<BasicCorpEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
         PageSimpleResponse<BasicCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();