chore: rebuild dist 2026-10-12 11:33

cfc-web/package.json

@@ -1,6 +1,10 @@
 {
   "name": "cfc-web",
+<<<<<<< HEAD
   "version": "1.0.1585",
+=======
+  "version": "1.0.1584",
+>>>>>>> b14532bae (chore: rebuild dist 2026-10-12 11:33)
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",

cfc-web/public/CHANGELOG-v1.0.md

@@ -4,6 +4,7 @@
 
 ---
 
+<<<<<<< HEAD
 ## v1.0.1585 (2026-10-12)
 
 ### Bug 修复
@@ -26,6 +27,8 @@
 - 扫码登录成功回传 userId/role，移除多余 allow(dead_code)
 
 
+=======
+>>>>>>> b14532bae (chore: rebuild dist 2026-10-12 11:33)
 ## v1.0.1584 (2026-10-12)
 
 ### Bug 修复

cfc-web/public/CHANGELOG.md

@@ -1,6 +1,10 @@
 # 更新日志
 
+<<<<<<< HEAD
 > 当前版本: v1.0.1585
+=======
+> 当前版本: v1.0.1584
+>>>>>>> b14532bae (chore: rebuild dist 2026-10-12 11:33)
 
 ## 历史版本
 
@@ -8,6 +12,7 @@
 
 ---
 
+<<<<<<< HEAD
 ## v1.0.1585 (2026-10-12)
 
 ### Bug 修复
@@ -30,6 +35,8 @@
 - 扫码登录成功回传 userId/role，移除多余 allow(dead_code)
 
 
+=======
+>>>>>>> b14532bae (chore: rebuild dist 2026-10-12 11:33)
 ## v1.0.1584 (2026-10-12)
 
 ### Bug 修复