6745-2404_testToMaster #1950

Merged
alexm merged 191 commits from 6745-2404_testToMaster into master 2024-01-25 07:39:13 +00:00
3 changed files with 22 additions and 0 deletions
Showing only changes of commit 5dbfe31a60 - Show all commits

View File

@ -10,5 +10,11 @@
"eslint.format.enable": true,
"[javascript]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
},
"cSpell.words": [
"Loggable"
],
"[json]": {
"editor.defaultFormatter": "vscode.json-language-features"
}
}

View File

@ -142,6 +142,9 @@
"VnUser": {
"dataSource": "vn"
},
"VnRole": {
"dataSource": "vn"
},
"OsTicket": {
"dataSource": "osticket"
},

13
back/models/vn-role.json Normal file
View File

@ -0,0 +1,13 @@
{
"name": "VnRole",
"base": "Role",
"validateUpsert": true,
"options": {
"mysql": {
"table": "account.role"
}
},
"mixins": {
"RegisterLog": true
}
}