Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复采购库存销售模块问题

# Conflicts:
#	sf_base/models/tool_base_new.py

sf_base/models/tool_other_features.py

@@ -162,6 +162,7 @@ class FeedPerTooth(models.Model):
     _order = 'blade_diameter,cutting_width_depth_id,materials_type_id'
 
     name = fields.Char('名称')
+    cutting_speed = fields.Char('切削速度', required=True)
     product_template_id = fields.Many2one('product.template')
     standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='标准库')
     blade_diameter = fields.Integer('刃部直径(mm)', readonly=True)