Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-31 06c9ac9b43af8492a9dbd1eee1a309170eed71d9

 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)