diff --git a/CHANGELOG.md b/CHANGELOG.md
index 623279d..ce8f1e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,23 @@
 
 ---
 
+## [2.1.0] - 2026-06-12
+
+### 新增功能
+
+#### 设备字段必填规则与可见性同步
+- 新增动态 Joi Schema 生成器（`dynamicDeviceSchema.js`），设备创建/编辑时从 `DeviceField` 表动态读取字段配置
+- 前端设备表单（`DeviceFormModal`）完全适配字段管理配置，取消 `rackId/position/height` 的硬编码排除
+- 新增字段管理页面防护，强制锁定系统核心字段（`name`/`serialNumber`/`position`/`height`）的必填和可见性开关
+- 同步前端默认常量与后端 `initDeviceFields.js` 一致（`deviceId` required 改为 `false`，`powerConsumption` required 改为 `true`）
+
+### 修复
+
+- 修复字段管理页面修改配置后，设备添加/编辑页面配置不生效的问题
+- 修复 `powerConsumption` 前后端默认值不一致的问题
+
+---
+
 ## [2.0.0] - 2026-05-06
 
 ### 新增功能
diff --git a/backend/package.json b/backend/package.json
index 0bbd4d1..ee07a02 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "idc-backend",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "IDC设备管理系统后端",
   "scripts": {
     "start": "node server.js",
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index e7c2231..c7e99e6 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "idc-frontend",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "idc-frontend",
-      "version": "2.0.0",
+      "version": "2.1.0",
       "dependencies": {
         "@ant-design/icons": "^6.1.0",
         "@ant-design/icons-svg": "^4.4.2",
diff --git a/frontend/package.json b/frontend/package.json
index d93a4aa..aeafd4a 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "idc-frontend",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "IDC设备管理系统前端",
   "scripts": {
     "start": "vite",
diff --git a/package-lock.json b/package-lock.json
index a8a07b9..accb178 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "idc-device-management",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "idc-device-management",
-      "version": "2.0.0",
+      "version": "2.1.0",
       "license": "MIT",
       "dependencies": {
         "@ant-design/cssinjs": "^2.1.2",
diff --git a/package.json b/package.json
index dc38c50..d12a910 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "idc-device-management",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "IDC设备管理系统",
   "scripts": {
     "start": "concurrently \"npm run start:backend\" \"npm run start:frontend\"",