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

admin

2019-11-25 94649b464866dd4f0d544659d43c98ab3e3a08df

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponActivateService.java

@@ -24,4 +24,10 @@
    */

   public void updateByPrimaryKeySelective(UserSystemCouponActivate record);



   /**

    * 创建记录

    * @param id

    */

   public void addActivateRecord(Long id);



}