7167-testToMaster_2414 #2244

Merged
alexm merged 643 commits from 7167-testToMaster_2414 into master 2024-04-04 05:32:41 +00:00
4 changed files with 29 additions and 12 deletions
Showing only changes of commit 7b0bed209e - Show all commits

View File

@ -44,7 +44,8 @@ ALTER TABLE IF EXISTS vn.saleGroupDetail ADD COLUMN editorFk INT;
ALTER TABLE vn.ticketLog
MODIFY COLUMN changedModel enum('Ticket',
MODIFY COLUMN changedModel ENUM(
'Ticket',
'Sale',
'TicketWeekly',
'TicketTracking',

View File

@ -0,0 +1,2 @@
INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
VALUES ('ParkingLog', '*', 'READ', 'ALLOW', 'ROLE', 'employee');

View File

@ -0,0 +1,5 @@
{
"ParkingLog": {
"dataSource": "vn"
}
}

View File

@ -0,0 +1,9 @@
{
"name": "ParkingLog",
"base": "Log",
"options": {
"mysql": {
"table": "parkingLog"
}
}
}