Explorar el Código

chore: auto bump version and changelog [skip ci]

iwt hace 1 semana
padre
commit
6340cd596e

+ 26 - 0
cfc-backend/src/main/java/com/etotem/cfc/entity/HealthMealRecord.java

@@ -52,7 +52,33 @@ public class HealthMealRecord {
     /** 是否补打: 1=补打(无能量值), 0=当日打卡 */
     private Integer isBackfill;
 
+    @Data
+@TableName("health_meal_record")
+public class HealthMealRecord {
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    
+    private Long memberId;
+    private Long checkinId;
+    private String mealType;
+    private String foodItems;
+    private Integer totalCalories;
+    private Integer proteinG;
+    private Integer fatG;
+    private Integer carbsG;
+    private Integer fiberG;
+    private Date mealTime;
+    private String remark;
+    private String photoUrls;
+    private String voiceUrl;
+    private String voiceText;
+    private Date recordDate;
+    private Integer isBackfill;
     private Date createdAt;
+    
+    /** 关联任务ID(一次性任务打卡后自动完成;为空则走每日任务累计) */
+    @TableField(exist = false)
+    private Long taskId;
 
     /** 关联任务ID(一次性任务打卡后自动完成;null=走每日任务累计路径) */
     @TableField(exist = false)

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-64b64dd06ff2080639da9fcb3377cf134771ffa4
+b959ca4eb780e34024ede06d722835ca102718cc

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

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

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

@@ -4,6 +4,20 @@
 
 ---
 
+## v1.0.1603 (2026-10-13)
+
+### Bug 修复
+- 已撤回文章支持重新编辑流程(状态机+前台按钮)
+
+### 其他
+- - AdminArticleController.update(): 放开 withdrawn 编辑限制(原仅 draft/published)
+- - ArticleManage.vue: 已撤回行下拉菜单新增「重新编辑」操作
+- - ArticleEdit.vue: 编辑页标题模板扩展匹配 withdrawn(显示「保存到草稿箱重新编辑」)
+- - getUpdatedSince(): status 缺省时默认 published,堵住 RAG 增量接口内容泄漏
+- - generateQuiz(): 增加 status=published 检查,禁止对撤回文章生成 AI 题目
+- 
+
+
 ## v1.0.1602 (2026-10-13)
 
 ### Bug 修复

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

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.1602
+> 当前版本: v1.0.1603
 
 ## 历史版本
 
@@ -8,6 +8,20 @@
 
 ---
 
+## v1.0.1603 (2026-10-13)
+
+### Bug 修复
+- 已撤回文章支持重新编辑流程(状态机+前台按钮)
+
+### 其他
+- - AdminArticleController.update(): 放开 withdrawn 编辑限制(原仅 draft/published)
+- - ArticleManage.vue: 已撤回行下拉菜单新增「重新编辑」操作
+- - ArticleEdit.vue: 编辑页标题模板扩展匹配 withdrawn(显示「保存到草稿箱重新编辑」)
+- - getUpdatedSince(): status 缺省时默认 published,堵住 RAG 增量接口内容泄漏
+- - generateQuiz(): 增加 status=published 检查,禁止对撤回文章生成 AI 题目
+- 
+
+
 ## v1.0.1602 (2026-10-13)
 
 ### Bug 修复