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

admin

2019-08-27 6b12faed50dda2d32c4dc2e60db59aaa721d7813

 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java

@@ -324,7 +324,6 @@
         if (once) // 兑换之后消失

            exchange = null;

         

			
         return exchange;

      } catch (Exception e) {

         LogHelper.errorDetailInfo(e);