Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

# Conflicts:
#	sf_manufacturing/models/product_template.py

sf_base/models/tool_base_new.py

@@ -243,3 +243,12 @@ class MaintenanceStandardImage(models.Model):
             else:
                 record['image'] = ""
         return records
+
+
+class ToolGroups(models.Model):
+    _name = 'sf.tool.groups'
+    _description = '刀具组'
+
+    name = fields.Char('名称')
+    equipment_ids = fields.Many2many('maintenance.equipment', 'ref_maintenance_equipment', string='机台号')
+    remark = fields.Char('备注', size=50)