Merge remote-tracking branch 'origin/master'

data-base/base-sync-stock-wms/src/main/java/com/bailuntec/domain/pojo/FbaStockInfo.java

@@ -23,9 +23,9 @@ public class FbaStockInfo {
     private String warehouseCode;
     @JSONField(name = "asin")
     private String asin;
-    @JSONField(name = "stockQuantity")
-    private Integer usableStock;
     @JSONField(name = "totalQuantity")
+    private Integer usableStock;
+    @JSONField(name = "stockQuantity")
     private Integer inWarehouse;
 
 }
\ No newline at end of file

data-base/base-sync-stock-wms/src/main/java/com/bailuntec/job/FbaStockJob.java

@@ -209,7 +209,7 @@ public class FbaStockJob extends PointJob {
     }
 
     private void handleFbaShareStock(List<DcBaseStockFba> stockFbaList) {
-        for (int i = 0; i < stockFbaList.size(); i++) {
+        for (int i = 0; i < stockFbaList.size() - 1; i++) {
             stockFbaList.get(i).setUsableStock(0);
             stockFbaList.get(i).setInWarehouse(0);
         }