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

admin

2020-02-26 a276635f2b82e5ee653275024d6211f7132df9a1

 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 {