Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Songb
2024-07-15 16:33:06 +08:00
@@ -1,11 +1,12 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_resource_calendar_holiday,access.resource.calendar.holiday,model_resource_calendar_holiday,base.group_user,1,1,1,1
access_overtime_approval,access.overtime.approval,model_overtime_approval,base.group_user,1,1,1,1
access_go_approval,access.go.approval,model_go_approval,base.group_user,1,1,1,1
access_duty_approval,access.duty.approval,model_duty_approval,base.group_user,1,1,1,1
access_leave_approval,access.leave.approval,model_leave_approval,base.group_user,1,1,1,1
access_holidays_approval,access.holidays.approval,model_holidays_approval,base.group_user,1,1,1,1
access_remove_holiday_approval,access.remove.holiday.approval,model_remove_holiday_approval,base.group_user,1,1,1,1
access_card_approval,access.card.approval,model_card_approval,base.group_user,1,1,1,1
access_resource_calendar_holiday,resource.calendar.holiday,model_resource_calendar_holiday,base.group_user,1,1,1,1
access_overtime_approval,overtime.approval,model_overtime_approval,base.group_user,1,1,1,1
access_overtime_user_line,overtime_user_line,model_overtime_user_line,base.group_user,1,1,1,1
access_go_approval,go.approval,model_go_approval,base.group_user,1,1,1,1
access_duty_approval,duty.approval,model_duty_approval,base.group_user,1,1,1,1
access_leave_approval,leave.approval,model_leave_approval,base.group_user,1,1,1,1
access_holidays_approval,holidays.approval,model_holidays_approval,base.group_user,1,1,1,1
access_remove_holiday_approval,remove.holiday.approval,model_remove_holiday_approval,base.group_user,1,1,1,1
access_card_approval,card.approval,model_card_approval,base.group_user,1,1,1,1
access_holiday_setting,holiday_setting,model_holiday_setting,base.group_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_resource_calendar_holiday access.resource.calendar.holiday resource.calendar.holiday model_resource_calendar_holiday base.group_user 1 1 1 1
3 access_overtime_approval access.overtime.approval overtime.approval model_overtime_approval base.group_user 1 1 1 1
4 access_go_approval access_overtime_user_line access.go.approval overtime_user_line model_go_approval model_overtime_user_line base.group_user 1 1 1 1
5 access_duty_approval access_go_approval access.duty.approval go.approval model_duty_approval model_go_approval base.group_user 1 1 1 1
6 access_leave_approval access_duty_approval access.leave.approval duty.approval model_leave_approval model_duty_approval base.group_user 1 1 1 1
7 access_holidays_approval access_leave_approval access.holidays.approval leave.approval model_holidays_approval model_leave_approval base.group_user 1 1 1 1
8 access_remove_holiday_approval access_holidays_approval access.remove.holiday.approval holidays.approval model_remove_holiday_approval model_holidays_approval base.group_user 1 1 1 1
9 access_card_approval access_remove_holiday_approval access.card.approval remove.holiday.approval model_card_approval model_remove_holiday_approval base.group_user 1 1 1 1
10 access_card_approval card.approval model_card_approval base.group_user 1 1 1 1
11 access_holiday_setting holiday_setting model_holiday_setting base.group_user 1 1 1 1
12