Merge branch 'huangyuan-user' of lift-manager/lift-server into develop

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/mapper/IPushUserMapper.java

@@ -44,5 +44,5 @@ public interface IPushUserMapper extends BaseMapper<PushUserInfo> {
      */
     @SelectProvider(type = MybatisSqlUtils.class, method = "getPushUserInfoByIdsSql")
     List<PushUserInfo> getPushUserInfoByUserIds(@Param("companyId") Long companyId,
-                                                @Param("userIds") List<Long> userIdList);
+                                                @Param("userIdList") List<Long> userIdList);
 }