Merge branch 'master' into deploy

eladmin-logging/src/main/java/me/zhengjie/rest/LogController.java

@@ -71,7 +71,7 @@ public class LogController {
     @ApiOperation("用户日志查询")
     public ResponseEntity<Object> queryUserLog(LogQueryCriteria criteria, Pageable pageable){
         criteria.setLogType("INFO");
-        criteria.setBlurry(SecurityUtils.getCurrentUsername());
+        criteria.setUsername(SecurityUtils.getCurrentUsername());
         return new ResponseEntity<>(logService.queryAllByUser(criteria,pageable), HttpStatus.OK);
     }
 

eladmin-logging/src/main/java/me/zhengjie/service/dto/LogQueryCriteria.java

@@ -31,6 +31,9 @@ public class LogQueryCriteria {
     @Query(blurry = "username,description,address,requestIp,method,params")
     private String blurry;
 
+    @Query
+    private String username;
+
     @Query
     private String logType;