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

admin

2020-04-26 d2f0048ff3d2e927ab0629fffe3e40ba91c11976

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoOrderServiceImpl.java

@@ -177,6 +177,7 @@
         // 提交事务

         transactionManager.commit(transactionStatus);

      } catch (Exception e) {

         e.printStackTrace();

         transactionManager.rollback(transactionStatus);

      }

   }