Merge remote-tracking branch 'origin/master'

src/main/java/com/neotel/smfcore/core/storage/rest/MaterialStockController.java

@@ -336,8 +336,8 @@ public class MaterialStockController {
             Map<String, Object> map = new LinkedHashMap<>();
             map.put(partNumberStr, item.getPartNumber());
             map.put(countStr, item.getStockCount());
-            map.put(lockReelStr, item.getLockReel());
-            map.put(stockReelStr, item.getSupplementReel());
+            map.put(stockReelStr, item.getStockReel());
+            map.put(lockReelStr, item.getSupplementReel());
             map.put(storageNameStr, item.getAmount());
             maps.add(map);
         }