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

admin

2019-08-30 0272ffc3e7037e10c2ddadeea6c597850903878f

 fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityUserService.java

@@ -80,4 +80,18 @@
    * @return

    */

   public ActivityRuleUser selectRuleUserByPrimaryKey(Long id);

	
	
   /**

    * 根据大淘客分类ID随机获取用户

    * @param cid

    * @return

    */

   public ActivityUser getRandomByDaTaoKeCid(int cid);

	
   /**

    * 获取好货推荐的随机用户

    * @return

    */

   public ActivityUser getRandomHaoHuo();

}