Merge pull request '测试' (#1) from branch_cwy into main

mall

@@ -1 +0,0 @@
-Subproject commit c824eacdb7758fe19ce801b5bd18a2bd2f275991

mall_hou/mall-admin/src/main/java/com/macro/mall/bo/AdminUserDetails.java

@@ -13,6 +13,9 @@ import java.util.stream.Collectors;
 /**
  * SpringSecurity需要的用户信息封装类
  * Created by macro on 2018/4/26.
+ * i11111
+ * dsdhsjhfjs
+ * fdjkf
  */
 public class AdminUserDetails implements UserDetails {
     //后台用户

src/views/layout/components/AppMain.vue

@@ -11,7 +11,7 @@
 export default {
   name: 'AppMain',
   computed: {
-    // key() {
+    // .......key() {
     //   return this.$route.name !== undefined ? this.$route.name + +new Date() : this.$route + +new Date()
     // }
   }