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

admin

2020-03-09 7c03a2c38c499e526f5c4258c35413160d784d04

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/jd/JDOrderServiceImpl.java

@@ -22,7 +22,7 @@
   @Resource

   private JDOrderMapper jdOrderMapper;



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public void addJDOrder(JDOrder order) throws JDOrderException {

      if (order == null)