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

src/main/java/com/caimei365/commodity/service/impl/SearchProductServiceImpl.java

@@ -92,9 +92,9 @@ public class SearchProductServiceImpl implements SearchProductService {
             }
             for (int i = 0; i < brandList.size(); i++) {
                 if (i == 0) {
-                    brandBuilder.append(brandList.get(i));
+                    brandBuilder.append("p_brand_id = ").append(brandList.get(i));
                 } else {
-                    brandBuilder.append(" OR ").append(brandList.get(i));
+                    brandBuilder.append(" OR ").append("p_brand_id = ").append(brandList.get(i));
                 }
             }
             String brandFilter = brandBuilder.toString();
@@ -255,9 +255,9 @@ public class SearchProductServiceImpl implements SearchProductService {
             }
             for (int i = 0; i < brandList.size(); i++) {
                 if (i == 0) {
-                    brandBuilder.append(brandList.get(i));
+                    brandBuilder.append("p_brand_id = ").append(brandList.get(i));
                 } else {
-                    brandBuilder.append(" OR ").append(brandList.get(i));
+                    brandBuilder.append(" OR ").append("p_brand_id = ").append(brandList.get(i));
                 }
             }
             String brandFilter = brandBuilder.toString();