From d3d85c2de3f85e1263ddf64ae272b5b5ea9f4854 Mon Sep 17 00:00:00 2001 From: zengtao01 Date: Wed, 10 Apr 2024 15:07:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=81=8F=E5=A5=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../userpreference/vo/AppUserPreferencePageReqVO.java | 10 ++++++---- .../app/userpreference/vo/AppUserPreferenceRespVO.java | 2 +- .../userpreference/vo/AppUserPreferenceSaveReqVO.java | 2 +- .../dataobject/userpreference/UserPreferenceDO.java | 2 +- .../dal/mysql/userpreference/UserPreferenceMapper.java | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/userpreference/vo/AppUserPreferencePageReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/userpreference/vo/AppUserPreferencePageReqVO.java index 5d344d18..bf8040f6 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/userpreference/vo/AppUserPreferencePageReqVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/userpreference/vo/AppUserPreferencePageReqVO.java @@ -1,10 +1,12 @@ package cn.iocoder.yudao.module.member.controller.app.userpreference.vo; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -37,7 +39,7 @@ public class AppUserPreferencePageReqVO extends PageParam { private String demand; @Schema(description = "饮食限制") - private String restrict; + private String restriction; @Schema(description = "自定义") private String custom; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/userpreference/vo/AppUserPreferenceRespVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/userpreference/vo/AppUserPreferenceRespVO.java index 1a33f09b..160ddcef 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/userpreference/vo/AppUserPreferenceRespVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/userpreference/vo/AppUserPreferenceRespVO.java @@ -46,7 +46,7 @@ public class AppUserPreferenceRespVO { @Schema(description = "饮食限制") @ExcelProperty("饮食限制") - private String restrict; + private String restriction; @Schema(description = "自定义") @ExcelProperty("自定义") diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/userpreference/vo/AppUserPreferenceSaveReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/userpreference/vo/AppUserPreferenceSaveReqVO.java index c2c8b087..08ba4dea 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/userpreference/vo/AppUserPreferenceSaveReqVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/userpreference/vo/AppUserPreferenceSaveReqVO.java @@ -29,7 +29,7 @@ public class AppUserPreferenceSaveReqVO { private String demand; @Schema(description = "饮食限制") - private String restrict; + private String restriction; @Schema(description = "自定义") private String custom; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/userpreference/UserPreferenceDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/userpreference/UserPreferenceDO.java index 2944958e..94072a5d 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/userpreference/UserPreferenceDO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/userpreference/UserPreferenceDO.java @@ -62,7 +62,7 @@ public class UserPreferenceDO extends BaseDO { /** * 饮食限制 */ - private String restrict; + private String restriction; /** * 自定义 */ diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/userpreference/UserPreferenceMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/userpreference/UserPreferenceMapper.java index fcc150e1..c90bef44 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/userpreference/UserPreferenceMapper.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/userpreference/UserPreferenceMapper.java @@ -24,7 +24,7 @@ public interface UserPreferenceMapper extends BaseMapperX { .eqIfPresent(UserPreferenceDO::getFoodType, reqVO.getFoodType()) .eqIfPresent(UserPreferenceDO::getAllergy, reqVO.getAllergy()) .eqIfPresent(UserPreferenceDO::getDemand, reqVO.getDemand()) - .eqIfPresent(UserPreferenceDO::getRestrict, reqVO.getRestrict()) + .eqIfPresent(UserPreferenceDO::getRestriction, reqVO.getRestrict()) .eqIfPresent(UserPreferenceDO::getCustom, reqVO.getCustom()) .betweenIfPresent(UserPreferenceDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(UserPreferenceDO::getId));