Merge remote-tracking branch 'origin/release-201827-wangcz' into release-201827-wangcz

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ReleaseProductByBatchServiceImpl.java

@@ -301,7 +301,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
                 success = releaseProductByBatchDao.getCountPublisherUuAndBatchAndReleaseCode(userUU, batch, ReleaseStatus.success.value());
             }
 		}
-		if (!isAPerson) {
+		if (!isAPerson && !isPcb) {
 			String publish = publishByBatch(batch, isPcb, ignoreImport);
 			modelMap.put("publish", publish);
 		}

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -2586,7 +2586,9 @@ define(['app/app', 'jquery-uploadify'], function(app) {
         return;
       }
       if (index === 0) {
-        if (Number(prices[index].rMBPrice) > 0) {
+        if (Number(prices[index].rMBPrice) > 0 && $scope.store.enType !== 'HK') {
+          $scope.productUpOff.goods.autoPublish = true
+        } else if (Number(prices[index].uSDPrice) > 0) {
           $scope.productUpOff.goods.autoPublish = true
         }
       }