Merge branch 'master' of csk/kmall-haikong into master

wareCode从配置文件中获取，不再从mall_good表里取wareSn进行填充

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsServiceImpl.java

@@ -1627,7 +1627,8 @@ public class GoodsServiceImpl implements GoodsService {
             criteria.setItemCode(goods.getSku());
             criteria.setOwnerCode(haiKongProperties.getWareCompanyCode());
             criteria.setInventoryType(Constants.InventoryType.ZP.getType());
-            criteria.setWarehouseCode(goods.getWarehouseSn());
+            //criteria.setWarehouseCode(goods.getWarehouseSn());
+            criteria.setWarehouseCode(haiKongProperties.getWareCode());
             criteriaList.add(criteria);
             wareQueryStockParamDTO.setCriteriaList(criteriaList);
             try {