Merge branch 'master' of 47.92.228.5:huyi/warehouse into hy

src/main/webapp/webpage/modules/warehouse/storage/storageList.js

@@ -293,7 +293,7 @@ $(document).ready(function() {
 
 	function onStorage(countStorage, goodsInfoId, rowIndex){
 		var main = JSON.parse(countStorage);
-	  jp.get("${ctx}/warehouse/storage/storage/findInfoBycountStorage?goodsInfo.id="+goodsInfoId+"&storage="+main.storageId, function (res){
+	  jp.get("${ctx}/warehouse/storage/storage/findInfoBycountStorage?goodsInfo.id="+goodsInfoId+"&storage.id="+main.storageId, function (res){
 		  var data = res.body.storageInfoList;
 		  if(Array.isArray(data)){
 			  var shelvesIds = data.map(function (item){