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

admin

2019-10-30 3f7c35dcb3bd703fcb952bb1a7d3ba5088d87b54

 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