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

admin

2019-09-02 34b542007f7e0dd4e1fdffecbd12a377aa953d68

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

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

    */

   public void addInviteActivate(Long uid);

	
	




}