jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并代码

Browse Source
This commit is contained in:
gqh
2022-11-07 11:21:31 +08:00
parent 84cf25f39d
commit 8776fc7d6c
4 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_base/security/ir.model.access.csv
View File

@@ -14,13 +14,9 @@ access_mrs_materials_model,mrs_materials_model,model_mrs_materials_model,base.gr
access_mrs_processing_technology,mrs_processing_technology,model_mrs_processing_technology,base.group_user,1,1,1,1
access_sf_tray,sf_tray,model_sf_tray,base.group_user,1,1,1,1
access_cnc_processing,cnc_processing,model_cnc_processing,base.group_user,1,1,1,1
<<<<<<< HEAD
=======
access_sf_model_type,sf_model_type,model_sf_model_type,base.group_user,1,1,1,1
access_sf_model_type_routing_sort,sf_model_type_routing_sort,model_sf_model_type_routing_sort,base.group_user,1,1,1,1
>>>>>>> a33b16cf78ac96c7254fa26cd71610cc3aef97fa
Can't render this file because it has a wrong number of fields in line 17.