Merge remote-tracking branch 'origin/master'

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/UserRepository.java

@@ -239,7 +239,7 @@ public interface UserRepository extends JpaRepository<User, Long>, JpaSpecificat
      * @param flag
      * @return
      */
-    @Query(value = "from User where expirationTime < ?1 and enabled = ?2")
+    @Query(value = "from User where  expirationTime < ?1 and enabled = ?2")
     List<User> findUserByTime(DateTime date,Boolean flag);
 
     /**