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

admin

2020-03-20 c3a5e164cbabbfc5f66e1356cb0de657ce3f58b9

 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)