Commit Graph

6 Commits

Author SHA1 Message Date
wangjiahao
c9b206ccd8 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java
#	backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml
#	backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
#	backend/src/main/resources/generatorConfig.xml
#	frontend/src/views/panel/list/PanelViewShow.vue
2021-05-18 16:14:46 +08:00
wangjiahao
79e93655ec feat: 数据权限配置 2021-05-18 16:07:19 +08:00
fit2cloud-chenyw
31e5cca439 feat:前端增加国际化切换 2021-05-18 15:46:14 +08:00
fit2cloud-chenyw
150b4c3982 feat: 完善token续命刷新机制 2021-03-08 18:19:57 +08:00
fit2cloud-chenyw
5f6ab3c8fa feat: 恢复误删 2021-02-26 12:03:01 +08:00
fit2cloud-chenyw
b07ea4ab71 feat: 前后端auth模块重构 2021-02-26 11:27:33 +08:00