jinling.yang 61da25a031 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售权限 ...

# Conflicts:
#	sf_manufacturing/models/product_template.py

2023-11-23 17:39:35 +08:00

..

group_security.xml

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售权限

2023-11-23 17:39:35 +08:00

ir.model.access.csv

修改设备生成名称规则，修改制造模块权限组定义

2023-11-23 16:33:09 +08:00