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

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreImportApiServiceImpl.java

@@ -103,7 +103,7 @@ public class StoreImportApiServiceImpl implements StoreImportApiService {
             return ServiceResponse.success();
         }
         List<String> resultList = new ArrayList<>();
-        List<TabStoreBrand> storeBrandList = storeBrandService.listAllStoreBrand(enterpriseId, null, null, null);
+        List<TabStoreBrand> storeBrandList = storeBrandService.listAllStoreBrand(enterpriseId, null);
         if (CollectionUtils.isEmpty(storeBrandList)) {
             return ServiceResponse.success();
         }

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreTaskServiceImpl.java

@@ -110,7 +110,7 @@ public class StoreTaskServiceImpl extends AbstractTaskAllocationOperation implem
         String brands = t.getBrands();
         if (StringUtils.isNotBlank(brands)) {
             String[] brandArr = brands.split("、");
-            List<TabStoreBrand> storeBrandList = storeBrandService.listAllStoreBrand(t.getEnterpriseId(), null, null, null);
+            List<TabStoreBrand> storeBrandList = storeBrandService.listAllStoreBrand(t.getEnterpriseId(), null);
             List<Integer> list = new ArrayList<>();
             for (String brandName : brandArr) {
                 for (TabStoreBrand storeBrand : storeBrandList) {

gic-store-service/src/main/java/com/gic/store/service/outer/impl/Test.java

-package com.gic.store.service.outer.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.gic.search.business.api.constant.enums.OperateEnum;
-import com.gic.search.business.api.utils.QueryConditionAssemblyUtil;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class Test {
-    public static void main(String[] args) throws ParseException {
-        List<Integer> list = new ArrayList<>();
-        for(int i=0; i<20; i++){
-            list.add(i);
-        }
-        Set<Integer> set = new HashSet<>(list);
-        for(int j=0; j<10; j++){
-            if(set.contains(j)){
-                set.remove(j);
-            }
-        }
-        System.out.println(new ArrayList<>(set));
-    }
-
-}