合并

sf_base/models/base.py

@@ -239,10 +239,8 @@ class MachineToolType(models.Model):
 class CuttingTool(models.Model):
     _name = 'sf.cutting_tool.category'
     _description = '刀具类别'
-
     code = fields.Char('编码')
     name = fields.Char('名称')
-
     remark = fields.Text('备注')
     active = fields.Boolean('有效', default=True)
 
@@ -250,7 +248,6 @@ class CuttingTool(models.Model):
 class CuttingToolType(models.Model):
     _name = 'sf.cutting_tool.type'
     _description = '刀具型号'
-
     code = fields.Char('编码')
     name = fields.Char('名称')
     diameter = fields.Integer('直径')