Merge remote-tracking branch 'origin/div' into div

admin

2019-11-15 2a93320d3adf8c72ea127df59d0bdd043917dd79

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java

@@ -735,7 +735,6 @@
   public void processJDOrder(JDOrder order) {

      if (order == null || order.getOrderItemList() == null || order.getOrderItemList().size() == 0)

         return;



      // 拆单的不做处理

      if (order.getValidCode() == 2)

         return;