Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增采购权限组

# Conflicts: # sf_base/security/group_security.xml # sf_sale/security/group_security.xml
2023-12-06 14:56:31 +08:00
parent 26ec1c9f6e 490aa3fe04
commit abd7364658
13 changed files with 220 additions and 56 deletions
--- a/sf_base/models/base.py
+++ b/sf_base/models/base.py
@@ -40,7 +40,7 @@ class MachineBrand(models.Model):
    active = fields.Boolean('有效', default=True)


-# 机床
+#机床
 class MachineTool(models.Model):
    _name = 'sf.machine_tool'
    _description = '机床'