Commit Graph

7 Commits

Author SHA1 Message Date
bcdba380cc Merge remote-tracking branch 'origin/admin' into acs_v1.0.0
# Conflicts:
#	nladmin-ui/src/i18n/langs/chinese.js
#	nladmin-ui/src/i18n/langs/english.js
#	nladmin-ui/src/i18n/langs/indonesian.js
#	nladmin-ui/src/i18n/langs/task/en.js
#	nladmin-ui/src/i18n/langs/task/in.js
#	nladmin-ui/src/i18n/langs/task/zh.js
#	nladmin-ui/src/views/monitor/online/locale/en.js
#	nladmin-ui/src/views/monitor/online/locale/in.js
#	nladmin-ui/src/views/monitor/online/locale/zh.js
#	nladmin-ui/src/views/system/dept/locale/en.js
#	nladmin-ui/src/views/system/dept/locale/in.js
#	nladmin-ui/src/views/system/dept/locale/zh.js
#	nladmin-ui/src/views/system/notice/locale/en.js
#	nladmin-ui/src/views/system/notice/locale/in.js
#	nladmin-ui/src/views/system/notice/locale/zh.js
#	nladmin-ui/src/views/system/redis/locale/en.js
#	nladmin-ui/src/views/system/redis/locale/in.js
#	nladmin-ui/src/views/system/redis/locale/zh.js
#	nladmin-ui/src/views/system/timing/locale/corn/en.js
#	nladmin-ui/src/views/system/timing/locale/corn/in.js
#	nladmin-ui/src/views/system/timing/locale/corn/zh.js
#	nladmin-ui/src/views/system/timing/locale/en.js
#	nladmin-ui/src/views/system/timing/locale/in.js
#	nladmin-ui/src/views/system/timing/locale/zh.js
#	nladmin-ui/src/views/tools/codeGen/locale/en.js
#	nladmin-ui/src/views/tools/codeGen/locale/in.js
#	nladmin-ui/src/views/tools/codeGen/locale/zh.js
#	nladmin-ui/src/views/tools/storage/locale/en.js
#	nladmin-ui/src/views/tools/storage/locale/in.js
#	nladmin-ui/src/views/tools/storage/locale/zh.js
2024-05-29 09:51:35 +08:00
bba3cdc35b rev: i18n位置挪动 2024-05-29 09:09:47 +08:00
4237306bc0 fix: 日志管理国际化 2024-05-28 16:00:18 +08:00
e81e1f15d3 fix:acs国际化 2024-05-28 14:21:05 +08:00
f7f336b65e fix:frontend i18n 2024-05-28 10:45:04 +08:00
024c41fe03 refactor: nladmin-acs init 2024-05-28 09:58:57 +08:00
f5e6db390a refactor: 前后端基础部分 2024-05-27 14:15:48 +08:00