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

sf_maintenance/models/sf_maintenance.py

@@ -148,7 +148,7 @@ class SfMaintenanceEquipment(models.Model):
     MTcode = fields.Char("机台编码")
     created_user = fields.Many2one('res.users', string='创建人', default=lambda self: self.env.user)
     equipment_type = fields.Selection([('机床', '机床'), ('机器人', '机器人'), ('AGV小车', 'AGV小车'),
-                                       ('检测设备', '检测设备')], compute='_compute_category_id')
+                                       ('检测设备', '检测设备'), ('其他', '其他')], compute='_compute_category_id')
 
     @api.depends('category_id')
     def _compute_category_id(self):