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

admin

2019-11-25 e65037e672ecab852e2a6c5b242cdadfd1a58b33

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponActivateMapper.java

@@ -8,6 +8,14 @@
public interface UserSystemCouponActivateMapper extends BaseMapper<UserSystemCouponActivate> {
   
   /**
    * 查询更新
    * @param id
    * @return
    */
   UserSystemCouponActivate selectForUpdate(@Param("id")Long id);

	
   /**
    * 添加数量
    * @param id
    * @param count