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
This commit is contained in:
2024-05-29 09:51:35 +08:00
50 changed files with 1092 additions and 286 deletions

View File

@@ -0,0 +1,13 @@
export default {
'SysParam': {
'table': {
'code': 'Kode',
'name': 'Nama',
'values': 'Nilai',
'description': 'Catatan'
},
'rules': {
'NotNull': 'Tidak Dapat Kosong'
}
}
}