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

admin

2020-02-23 b8134c0133956c67cd94fb4efa036238df2cbe2e

 fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderProcessServiceImpl.java

@@ -52,7 +52,7 @@
   @Resource

   private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public void processOrder(ElmeOrder elmeOrder) throws ElmeOrderException {

      try {