chore: auto bump version and changelog [skip ci]

cfc-web/.last_build_commit

@@ -1 +1 @@
-b0c44883e1f57c6a2625dedc451e3a2e1b4c5892
+291258ffe47cb9424d94ce895c7edb26e767e85b

cfc-web/package.json

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

cfc-web/public/CHANGELOG.md

@@ -1,6 +1,12 @@
 # 更新日志 (Changelog)
 
 此文件记录所有构建版本的变更。
+## v1.0.299 (2026-07-14)
+
+### Bug 修复
+- resolve merge conflicts in cfc-web build files
+
+
 ## v1.0.298 (2026-07-14)