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

admin

2019-08-26 6009c2c07cd32a76b32c8d63a5a017be695c5ea5

 fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralExchangeService.java

@@ -53,7 +53,7 @@
    * @return

    * @throws IntegralExchangeException

    */

   public void exchangeInviteCode(Long uid, Long id) throws IntegralExchangeException;

   public String exchangeInviteCode(Long uid, Long id) throws IntegralExchangeException;



   

}