Merge branch 'mine' of http://106.13.50.125:13000/yuanqiang/yq_0bject_detection into mine

# Conflicts:
#	yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java

yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java

@@ -103,7 +103,6 @@ public class NoLogin {
         Map<String, Object> cacheMap = redisCache.getCacheMap(id);
         return cacheMap;
     }
-    
 
     //获取
     @GetMapping("/faceByteList")