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

admin

2019-09-03 74ee9c42c1d87f3724a21e92871bc8c95c8364c6

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

@@ -233,5 +233,8 @@
    * @param uid

    */

   public void addInviteActivate(Long uid);

	
	




}