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

yj

2020-03-04 58ee87fd64efdb75d16e396c3d952d3522c3a747

 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 {