Merge remote-tracking branch 'origin/master'

疯狂的狮子li

2020-04-29 42008124b68bfd7f2e2003c07bc0bdd5311f95b6

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-ui/src/assets/styles/ruoyi.scss
#	ruoyi-ui/src/views/tool/gen/index.vue

 ruoyi-ui/src/api/login.js

 ruoyi-ui/src/assets/styles/ruoyi.scss

 ruoyi-ui/src/components/RuoYi/Git/index.vue

 ruoyi-ui/src/layout/components/Navbar.vue

 ruoyi-ui/src/utils/index.js

@@ -383,3 +383,4 @@
export function isNumberStr(str) {
  return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
}
 

 ruoyi-ui/src/utils/permission.js

 ruoyi-ui/src/utils/ruoyi.js

@@ -131,3 +131,4 @@
    });
    return treeData != '' ? treeData : data;
  }
  

 ruoyi-ui/src/views/cstest/cstest/index.vue

文件已删除

 ruoyi-ui/src/views/login/auth-redirect.vue

 ruoyi-ui/src/views/login/components/SocialSignin.vue

 ruoyi-ui/src/views/monitor/job/index.vue

 ruoyi-ui/src/views/system/config/index.vue

 ruoyi-ui/src/views/system/dept/index.vue

 ruoyi-ui/src/views/system/dict/data.vue

 ruoyi-ui/src/views/system/dict/index.vue

 ruoyi-ui/src/views/system/menu/index.vue

 ruoyi-ui/src/views/system/notice/index.vue

 ruoyi-ui/src/views/system/post/index.vue

 ruoyi-ui/src/views/system/role/index.vue

 ruoyi-ui/src/views/system/user/index.vue

 ruoyi-ui/src/views/system/user/profile/userAvatar.vue

 ruoyi-ui/src/views/tool/gen/index.vue

 ruoyi/src/main/resources/vm/java/domain.java.vm

@@ -17,9 +17,6 @@
#elseif($table.tree)
import com.ruoyi.framework.web.domain.TreeEntity;
#end
#foreach ($import in $importList)
import ${import};
#end

/**
 * ${functionName}瀵硅薄 ${tableName}