Просмотр исходного кода

chore: resolve rebase conflicts - accept remote version for build artifacts

iwt 3 месяцев назад
Родитель
Сommit
3e2c6b9dad
4 измененных файлов с 79 добавлено и 4 удалено
  1. 1 1
      cfc-web/.last_build_commit
  2. 2 2
      cfc-web/package-lock.json
  3. 1 1
      cfc-web/package.json
  4. 75 0
      cfc-web/public/CHANGELOG.md

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-89f487475d6ee9b48d82e03c4590d94119e8c177
+a323851b8ced00f357cc195d0c8dc5555d11e53f

+ 2 - 2
cfc-web/package-lock.json

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

+ 1 - 1
cfc-web/package.json

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

+ 75 - 0
cfc-web/public/CHANGELOG.md

@@ -1,6 +1,80 @@
 # 更新日志 (Changelog)
 
 此文件记录所有构建版本的变更。
+## v1.0.313 (2026-07-14)
+
+
+## v1.0.312 (2026-07-14)
+
+### 新功能
+- add butler entities + migration + schema
+
+
+## v1.0.311 (2026-07-14)
+
+
+## v1.0.310 (2026-07-14)
+
+### Bug 修复
+- resolve merge conflicts in package.json, CHANGELOG.md, .last_build_commit
+
+
+## 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
+- - cfc-web: supply-hierarchy management (new), supply-system/Detail update
+- - cfc-frontend: App.vue, invite/join.vue updates
+- - cfc-web: admin.js API, router updates
+- 
+
+
+## v1.0.299 (2026-07-14)
+
+### Bug 修复
+- resolve merge conflicts in cfc-web build files
+
+
+## v1.0.298 (2026-07-14)
+
+
+## v1.0.297 (2026-07-14)
+
+
+## v1.0.296 (2026-07-14)
+
+
+## v1.0.294 (2026-07-14)
+
+
+## v1.0.293 (2026-07-14)
+
+### Bug 修复
+- add missing Map import in SupplySystemService
+
+
+## v1.0.292 (2026-07-14)
+
+
+## v1.0.291 (2026-07-14)
+
+### 新功能
+- add dan_reports - assessment reports and processing scripts
+- 肠道菌群报告详情页 + 上传日期评分优化 + 身页面重构 + 首页角色分流
+
+
+## v1.0.290 (2026-07-14)
+
+
 ## v1.0.289 (2026-07-14)
 
 ### 文档
@@ -20,6 +94,7 @@
 ## v1.0.288 (2026-07-14)
 
 
+
 ## v1.0.287 (2026-07-14)
 
 ### 新功能