You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
besure_server/yudao-ui-admin
YunaiV 9270924597 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm-back
 Conflicts:
	README.md
	yudao-framework/pom.xml
	yudao-framework/yudao-spring-boot-starter-biz-error-code/pom.xml
	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/security/config/SecurityConfiguration.java
4 years ago
..
bin 多模块重构 12:修改项目名字,按照新的规则 4 years ago
build 多模块重构 12:修改项目名字,按照新的规则 4 years ago
public v3.5.0 新增IE浏览器版本过低提示页面 4 years ago
src Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm-back 4 years ago
.editorconfig 多模块重构 12:修改项目名字,按照新的规则 4 years ago
.env.demo1024 v3.8.2 修改登录超时刷新页面跳转登录页面还提示重新登录问题 4 years ago
.env.dev 更新登录模板 4 years ago
.env.local 调整前端和环境的环境配置 4 years ago
.env.prod 调整前端和环境的环境配置 4 years ago
.env.stage 调整前端和环境的环境配置 4 years ago
.eslintignore 多模块重构 12:修改项目名字,按照新的规则 4 years ago
.eslintrc.js 多模块重构 12:修改项目名字,按照新的规则 4 years ago
.gitignore [Github Action]修复项目CI脚本构建失败问题 4 years ago
.npmrc perf: 增加.npmrc文件,默认使用新的淘宝镜像源 4 years ago
Jenkinsfile 多模块重构 12:修改项目名字,按照新的规则 4 years ago
babel.config.js v3.8.3 reset babel 4 years ago
package.json 指定element-ui依赖版本为2.15.8,规避2.15.9版本中Prop being mutated: "placement"报错的bug 4 years ago
vue.config.js v3.8.3 默认不启用压缩文件缓存防止node_modules过大 4 years ago
yarn.lock 1. code review 后台的短信验证码登陆 4 years ago