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

chore: auto bump version and changelog [skip ci]

iwt 2 месяцев назад
Родитель
Сommit
75d10ef05d

+ 3 - 1
cfc-backend/src/main/java/com/etotem/cfc/service/ReportSurveyService.java

@@ -71,7 +71,9 @@ public class ReportSurveyService {
     }
     }
 
 
     private void saveDietPreferencesFromSurvey(ReportSurvey survey, String surveyData) {
     private void saveDietPreferencesFromSurvey(ReportSurvey survey, String surveyData) {
-        JsonNode root = objectMapper.readTree(surveyData);
+        JsonNode root;
+        try { root = objectMapper.readTree(surveyData); }
+        catch (Exception e) { log.warn("解析surveyData失败: {}", e.getMessage()); return; }
         JsonNode surveyNode = root.has("survey") ? root.get("survey") : root;
         JsonNode surveyNode = root.has("survey") ? root.get("survey") : root;
         Long memberId = survey.getChildId();
         Long memberId = survey.getChildId();
         if (memberId == null) return;
         if (memberId == null) return;

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-c8ff8b97df8ef1184fa7dea52cb8de8370f3c0ef
+327bc9ed4761a3b1d1290f844a1cdda40ca10aab

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

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

+ 1 - 1
cfc-web/package.json

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

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

@@ -4,6 +4,19 @@
 
 
 ---
 ---
 
 
+## v1.0.1190 (2026-08-22)
+
+### 新功能
+- 身体调研加饮食偏好 + 食材档案清真/素食标识
+
+### 其他
+- - 提交问卷时自动同步到 diet_preferences 表(absoluteAvoid/mustEat/religiousDiet)
+- - 迁移254: diet_preferences 新增 must_eat 列
+- - 迁移253: foods 新增 diet_type 列(清真/halal/素食/vegan 标识)
+- - Food/DietPreferences 实体及 DTO 同步更新
+- 
+
+
 ## v1.0.1189 (2026-08-22)
 ## v1.0.1189 (2026-08-22)
 
 
 ### Bug 修复
 ### Bug 修复

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

@@ -1,6 +1,6 @@
 # 更新日志
 # 更新日志
 
 
-> 当前版本: v1.0.1189
+> 当前版本: v1.0.1190
 
 
 ## 历史版本
 ## 历史版本
 
 
@@ -8,6 +8,19 @@
 
 
 ---
 ---
 
 
+## v1.0.1190 (2026-08-22)
+
+### 新功能
+- 身体调研加饮食偏好 + 食材档案清真/素食标识
+
+### 其他
+- - 提交问卷时自动同步到 diet_preferences 表(absoluteAvoid/mustEat/religiousDiet)
+- - 迁移254: diet_preferences 新增 must_eat 列
+- - 迁移253: foods 新增 diet_type 列(清真/halal/素食/vegan 标识)
+- - Food/DietPreferences 实体及 DTO 同步更新
+- 
+
+
 ## v1.0.1189 (2026-08-22)
 ## v1.0.1189 (2026-08-22)
 
 
 ### Bug 修复
 ### Bug 修复