Merge branch 'master' into dev-moneydetail

admin

2018-12-19 d1bf4588a39bcba69fd39f3cc3b3a6c439e25cb6

 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java

@@ -800,6 +800,8 @@
      for (TaoBaoOrder order : orderList) {

         if (map.get(order.getOrderId()) == null)

            map.put(order.getOrderId(), new ArrayList<>());

         // 设置排序值，从1开始

         order.setOrderBy(map.get(order.getOrderId()).size() + 1);

         map.get(order.getOrderId()).add(order);

      }

      return map;