Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料

# Conflicts:
#	sf_manufacturing/models/product_template.py

sf_dlm/views/product_template_view.xml

@@ -359,6 +359,9 @@
                                     <field name="suitable_coolant_ids" string=""/>
                                 </group>
                             </group>
+                            <group string="切削速度Vc">
+                                <field name="cutting_speed_ids" string=""/>
+                            </group>
                         </group>
                     </page>
                     <page string="夹具物料参数" attrs="{'invisible': [('categ_type', '!=', '夹具')]}">