Procházet zdrojové kódy

chore: auto bump version and changelog [skip ci]

iwt před 4 týdny
rodič
revize
a4317231ae

+ 6 - 0
cfc-backend/src/main/java/com/etotem/cfc/config/DatabaseInitializer.java

@@ -2993,6 +2993,12 @@ log.info("已添加template_id列到tasks表");
 		} catch (Exception ex) {
 			log.warn("health_plans.updated_at 添加失败(可能已存在): " + ex.getMessage());
 		}
+		// 迁移253: foods表添加diet_type列(清真/素食标识)
+		try {
+			ensureColumn("foods", "diet_type", "VARCHAR(20) DEFAULT NULL COMMENT '饮食类型: none/清真/halal/素食/vegan'");
+		} catch (Exception ex) {
+			log.warn("foods.diet_type 添加失败(可能已存在): " + ex.getMessage());
+		}
         ensureColumn("file_record", "file_type", "VARCHAR(50) DEFAULT NULL COMMENT '文件类型: image/pdf/video/audio/other'");
         ensureColumn("file_record", "description", "TEXT COMMENT '文件描述'");
 

+ 2 - 0
cfc-backend/src/main/java/com/etotem/cfc/entity/Food.java

@@ -41,6 +41,8 @@ public class Food implements Serializable {
     private Integer score;
     private String status;
     private Integer sortOrder;
+    /** 饮食类型: none/清真/halal/素食/vegan */
+    private String dietType;
     private Date createdAt;
     private Date updatedAt;
 }

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-2907dcc54e1012e608cd505c02a29aeed49f21b8
+c8ff8b97df8ef1184fa7dea52cb8de8370f3c0ef

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

@@ -1,12 +1,12 @@
 {
   "name": "cfc-web",
-  "version": "1.0.1187",
+  "version": "1.0.1188",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cfc-web",
-      "version": "1.0.1187",
+      "version": "1.0.1188",
       "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.1188",
+  "version": "1.0.1189",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",

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

@@ -4,6 +4,12 @@
 
 ---
 
+## v1.0.1189 (2026-08-22)
+
+### Bug 修复
+- 修复食材数据未显示-响应路径修正为res.data,合并重复API调用
+
+
 ## v1.0.1188 (2026-08-21)
 
 ### 新功能

+ 7 - 1
cfc-web/public/CHANGELOG.md

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.1188
+> 当前版本: v1.0.1189
 
 ## 历史版本
 
@@ -8,6 +8,12 @@
 
 ---
 
+## v1.0.1189 (2026-08-22)
+
+### Bug 修复
+- 修复食材数据未显示-响应路径修正为res.data,合并重复API调用
+
+
 ## v1.0.1188 (2026-08-21)
 
 ### 新功能