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

src/main/java/com/uas/platform/b2b/service/impl/VendorsServiceImpl.java

@@ -336,7 +336,7 @@ public class VendorsServiceImpl implements VendorService {
         if (StringUtils.isEmpty(productMatchCondition) || productMatchCondition.contains("1=1")) {
 			productMatchCondition = " 1=1 ";
 		} else {
-        	productMatchCondition = productMatchCondition + " and pr_issale = 1 and pr_b2bdisabled <> 1";
+        	productMatchCondition = productMatchCondition + " and pr_issale = 1";
 		}
 		if (StringUtils.isEmpty(enterpriseMatchCondition)) {
 			enterpriseMatchCondition = " 1=1 ";