Merge branch 'dev' into base-modify

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/support/aop/TokenAop.java

@@ -70,6 +70,7 @@ public class TokenAop {
                 if (StringUtils.isEmpty(token)){
 //                   return ObjectRestResponse.createFailedResult(4004,"token不能为空");
                     args[i]= new AppUserDTO();
+                    break;
                 }
                args[i]= userFeign.userDetailByToken(token).getData();
                break;