Merge branch refs/heads/develop into refs/heads/feature/新增工艺退回调整

sf_base/models/base.py

@@ -410,3 +410,13 @@ class ReSaleOrder(models.Model):
     person_of_delivery = fields.Char('收货人')
     telephone_of_delivery = fields.Char('电话号码')
     address_of_delivery = fields.Char('联系地址')
+
+
+class EmbryoRedundancy(models.Model):
+    _name = "sf.embryo.redundancy"
+
+    name = fields.Char('名称', required=True)
+    long = fields.Float('长度', required=True)
+    width = fields.Float('宽度', required=True)
+    height = fields.Float('高度', required=True)
+    code = fields.Char('编码', required=True)