Merge branch 'master' of http://119.91.43.128:3001/sheng/mes-ui-d2

src/locales/en.json

@@ -333,6 +333,35 @@
 				}
 			}
 		},
+		"equipment_management": {
+			"equipment_model": {
+				"equipment_category": {
+					"search": "Search",
+					"reset": "Reset",
+					"enter_code": "Please enter equipment category code",
+					"enter_name": "Please enter equipment category name",
+					"operation_success": "Operation succeeded",
+					"sort": "No.",
+					"code": "Equipment Category Code",
+					"name": "Equipment Category Name",
+					"remark": "Remark",
+					"operation": "Actions",
+					"add": "Add",
+					"edit": "Edit",
+					"delete": "Delete",
+					"remark_required": "Please enter remark",
+					"remark_length": "Length must be 1 to 100 characters",
+					"add_title": "Add Equipment Category",
+					"edit_title": "Edit Equipment Category",
+					"cancel": "Cancel",
+					"confirm": "Confirm",
+					"tip": "Tip",
+					"confirm_delete": "Are you sure to delete this equipment category?",
+					"validation_fail": "Validation failed",
+					"please_enter": "Please enter {name}"
+				}
+			}
+		},
 		"system_administration": {
 			"user_management": {
 				"role": {

src/locales/zh-chs.json

@@ -333,6 +333,35 @@
 				}
 			}
 		},
+		"equipment_management": {
+			"equipment_model": {
+				"equipment_category": {
+					"search": "查询",
+					"reset": "重置",
+					"enter_code": "请输入设备类别编码",
+					"enter_name": "请输入设备类别名称",
+					"operation_success": "操作成功",
+					"sort": "序号",
+					"code": "设备类别编码",
+					"name": "设备类别名称",
+					"remark": "备注",
+					"operation": "操作",
+					"add": "新 增",
+					"edit": "编 辑",
+					"delete": "删 除",
+					"remark_required": "请输入备注",
+					"remark_length": "长度在 1 到 100 个字符",
+					"add_title": "新增设备类别",
+					"edit_title": "编辑设备类别",
+					"cancel": "取消",
+					"confirm": "确定",
+					"tip": "提示",
+					"confirm_delete": "确定要删除该设备类别吗?",
+					"validation_fail": "校验失败",
+					"please_enter": "请输入{name}"
+				}
+			}
+		},
 		"system_administration": {
 			"user_management": {
 				"role": {