fix: resolve merge conflicts in package.json, CHANGELOG.md, .last_build_commit

cfc-web/.last_build_commit

@@ -1 +1 @@
-812f0f6021b46f2747e1e3407a11ef4851a221c2
+f0880d4b2ca593f7aeda179d81fb1b1e4be0dd04

cfc-web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "cfc-web",
-  "version": "1.0.306",
+  "version": "1.0.307",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cfc-web",
-      "version": "1.0.306",
+      "version": "1.0.307",
       "dependencies": {
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^1.0.2",

cfc-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfc-web",
-  "version": "1.0.300",
+  "version": "1.0.309",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",

cfc-web/public/CHANGELOG.md

@@ -1,7 +1,16 @@
 # 更新日志 (Changelog)
 
 此文件记录所有构建版本的变更。
-## v1.0.300 (2026-07-14)
+## v1.0.308 (2026-07-14)
+
+
+## v1.0.307 (2026-07-14)
+
+### Bug 修复
+- add missing closing brace for export default in Detail.vue — fixes build error
+
+
+## v1.0.301 (2026-07-14)
 
 ### 其他
 - merge: integrate remote changes + supply hierarchy management