From 7e5a51f911b7f65b6c37e232b69dc18c6fb6a066 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期三, 06 十一月 2024 14:20:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/RecoveryClassify.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/RecoveryClassify.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/RecoveryClassify.java index 3dd5a05..b70b5e9 100644 --- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/RecoveryClassify.java +++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/RecoveryClassify.java @@ -44,12 +44,12 @@ private String classificationPicture; @ApiModelProperty("分类描述") - @TableField("describe") - private String describe; + @TableField("type_describe") + private String typeDescribe; @ApiModelProperty("排序权重") - @TableField("order") - private Integer order; + @TableField("sort") + private Integer sort; @ApiModelProperty("分类简介") @TableField("brief_introduction") -- Gitblit v1.7.1