Merge branch 'mater-1.6.0' into div

admin

2019-08-26 8cb383dcbfd972de368cdb556eff4293d14cf33e

 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;



   

}