From 1c2e7806beafae0e5d7e02dd15d607d3f1973068 Mon Sep 17 00:00:00 2001 From: pengsz Date: Fri, 5 Dec 2025 17:19:07 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=94=A8=E6=88=B7=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3=20=E8=AF=B7=E6=B1=82=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20=E8=A1=A8=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ActivityEnrollController.java | 66 ------------------- .../controller/TemplateMessageController.java | 57 ---------------- .../yzt/admin/controller/UserController.java | 4 +- .../request/StoreProductHeaderRequest.java | 4 ++ .../request/StoreProductSearchRequest.java | 7 +- .../yzt/common/request/UserCreateRequest.java | 6 +- .../request/UserExtractSearchRequest.java | 2 +- .../yzt/common/request/UserGroupRequest.java | 2 +- .../yzt/common/request/UserSearchRequest.java | 7 +- .../yzt/common/request/UserUpdateRequest.java | 26 ++++---- .../yzt/common/response/UserBillResponse.java | 2 +- .../common/response/UserCenterResponse.java | 4 ++ .../main/java/com/yzt/common/vo/TenantVo.java | 2 + .../com/yzt/common/vo/UserSignMonthVo.java | 2 +- .../yzt/service/mapper/StoreCartMapper.java | 2 +- .../com/yzt/service/service/UserService.java | 6 ++ .../service/impl/StoreProductServiceImpl.java | 6 ++ .../service/impl/UserExtractServiceImpl.java | 2 +- .../service/service/impl/UserServiceImpl.java | 35 ++++++---- .../mapper/record/UserVisitRecordMapper.xml | 4 +- .../main/resources/mapper/user/UserMapper.xml | 16 ++--- 21 files changed, 88 insertions(+), 174 deletions(-) delete mode 100644 fightwine-admin/src/main/java/com/yzt/admin/controller/ActivityEnrollController.java delete mode 100644 fightwine-admin/src/main/java/com/yzt/admin/controller/TemplateMessageController.java diff --git a/fightwine-admin/src/main/java/com/yzt/admin/controller/ActivityEnrollController.java b/fightwine-admin/src/main/java/com/yzt/admin/controller/ActivityEnrollController.java deleted file mode 100644 index a7de157..0000000 --- a/fightwine-admin/src/main/java/com/yzt/admin/controller/ActivityEnrollController.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.yzt.admin.controller; - -import com.yzt.common.page.CommonPage; -import com.yzt.common.request.ActivityEnrollSearchRequest; -import com.yzt.common.request.EnrollSearchRequest; -import com.yzt.common.request.PageParamRequest; -import com.yzt.common.response.ActivityEnrollResponse; -import com.yzt.common.result.CommonResult; -import com.yzt.common.vo.VirtualRemarkVo; -import com.yzt.service.service.StoreOrderInfoService; -import com.yzt.service.service.StoreProductService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.validation.constraints.Min; - -/** - * @Author: pengsz - * @Date: 2025/12/02 - * @Description: - */ -@RestController -@RequestMapping("/api/admin/activityenroll") -@Api(tags = "活动报名") //配合swagger使用 -@Slf4j -public class ActivityEnrollController { - @Autowired - StoreProductService storeProductService; - - @Autowired - StoreOrderInfoService storeOrderInfoService; - /** - * 分页显示 - * - * @param request 搜索条件 - * @param pageParamRequest 分页参数 - */ - @ApiOperation(value = "活动报名分页列表") //配合swagger使用 - @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated ActivityEnrollSearchRequest request, - @ModelAttribute PageParamRequest pageParamRequest) { - CommonPage activityEnrollCommonPage = CommonPage.restPage(storeProductService.getActivityList(request, pageParamRequest)); - return CommonResult.success(activityEnrollCommonPage); - } - - /** - * 分页显示 - * - * @param request 搜索条件 - * @param pageParamRequest 分页参数 - */ - @ApiOperation(value = "客户报名分页列表") //配合swagger使用 - @RequestMapping(value = "/customers", method = RequestMethod.GET) - public CommonResult> getEnrollmentListByActivity(@Validated EnrollSearchRequest request, - @ModelAttribute PageParamRequest pageParamRequest) { - CommonPage enrollCommonPage = CommonPage.restPage(storeOrderInfoService.getEnrollmentListByActivity(request.getId(), pageParamRequest)); - return CommonResult.success(enrollCommonPage); - } - - - -} diff --git a/fightwine-admin/src/main/java/com/yzt/admin/controller/TemplateMessageController.java b/fightwine-admin/src/main/java/com/yzt/admin/controller/TemplateMessageController.java deleted file mode 100644 index 3a0e7f9..0000000 --- a/fightwine-admin/src/main/java/com/yzt/admin/controller/TemplateMessageController.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.yzt.admin.controller; - - -import com.yzt.common.result.CommonResult; -import com.yzt.service.service.TemplateMessageService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - - -/** - * 微信模板 前端控制器 - * - */ -@Slf4j -@RestController -@RequestMapping("api/admin/wechat/template") -@Api(tags = "微信 -- 消息模版") //配合swagger使用 -public class TemplateMessageController { - - @Autowired - private TemplateMessageService templateMessageService; - - /** - * 公众号模板消息同步 - */ - @PreAuthorize("hasAuthority('admin:wechat:whcbqhn:sync')") - @ApiOperation(value = "公众号模板消息同步") - @RequestMapping(value = "/whcbqhn/sync", method = RequestMethod.POST) - public CommonResult whcbqhnSync() { - if (templateMessageService.whcbqhnSync()) { - return CommonResult.success("公众号模板消息同步成功"); - } - return CommonResult.failed("公众号模板消息同步失败"); - } - - /** - * 小程序订阅消息同步 - */ - @PreAuthorize("hasAuthority('admin:wechat:routine:sync')") - @ApiOperation(value = "小程序订阅消息同步") - @RequestMapping(value = "/routine/sync", method = RequestMethod.POST) - public CommonResult routineSync() { - if (templateMessageService.routineSync()) { - return CommonResult.success("小程序订阅消息同步成功"); - } - return CommonResult.failed("小程序订阅消息同步失败"); - } -} - - - diff --git a/fightwine-admin/src/main/java/com/yzt/admin/controller/UserController.java b/fightwine-admin/src/main/java/com/yzt/admin/controller/UserController.java index d5d4eee..64f61bd 100644 --- a/fightwine-admin/src/main/java/com/yzt/admin/controller/UserController.java +++ b/fightwine-admin/src/main/java/com/yzt/admin/controller/UserController.java @@ -123,8 +123,8 @@ public class UserController { @PreAuthorize("hasAuthority('admin:user:info')") @ApiOperation(value = "详情") @RequestMapping(value = "/info", method = RequestMethod.GET) - public CommonResult info(@RequestParam(value = "id") Integer id) { - return CommonResult.success(userService.getInfoByUid(id)); + public CommonResult info(@RequestParam(value = "id") Integer id) { + return CommonResult.success(userService.getByUid(id)); } /** diff --git a/fightwine-common/src/main/java/com/yzt/common/request/StoreProductHeaderRequest.java b/fightwine-common/src/main/java/com/yzt/common/request/StoreProductHeaderRequest.java index 5616dec..288e887 100644 --- a/fightwine-common/src/main/java/com/yzt/common/request/StoreProductHeaderRequest.java +++ b/fightwine-common/src/main/java/com/yzt/common/request/StoreProductHeaderRequest.java @@ -22,4 +22,8 @@ public class StoreProductHeaderRequest { @ApiModelProperty(value = "关键字搜索， 支持(商品名称, 关键字, 商品条码)") private String keywords; + + + @ApiModelProperty(value = "是否上架") + private Integer isShow; } diff --git a/fightwine-common/src/main/java/com/yzt/common/request/StoreProductSearchRequest.java b/fightwine-common/src/main/java/com/yzt/common/request/StoreProductSearchRequest.java index 2b2bf6c..3ffa0c1 100644 --- a/fightwine-common/src/main/java/com/yzt/common/request/StoreProductSearchRequest.java +++ b/fightwine-common/src/main/java/com/yzt/common/request/StoreProductSearchRequest.java @@ -25,8 +25,8 @@ public class StoreProductSearchRequest implements Serializable { private static final long serialVersionUID=1L; @ApiModelProperty(value = "类型（1：出售中（已上架），2：仓库中（未上架），3：已售罄，4：警戒库存，5：回收站）") - @NotNull(message = "商品类型不能为空") - @Range(min = 1, max = 5, message = "未知的商品类型") +// @NotNull(message = "商品类型不能为空") +// @Range(min = 1, max = 5, message = "未知的商品类型") private int type; @ApiModelProperty(value = "分类ID， 多个逗号分隔") @@ -44,4 +44,7 @@ public class StoreProductSearchRequest implements Serializable { @ApiModelProperty(value = "销量排序", allowableValues = "range[asc,desc]") private String salesOrder; + @ApiModelProperty(value = "状态（0：未上架，1：上架）") + private Boolean isShow; + } diff --git a/fightwine-common/src/main/java/com/yzt/common/request/UserCreateRequest.java b/fightwine-common/src/main/java/com/yzt/common/request/UserCreateRequest.java index 4fe30a7..01eb99a 100644 --- a/fightwine-common/src/main/java/com/yzt/common/request/UserCreateRequest.java +++ b/fightwine-common/src/main/java/com/yzt/common/request/UserCreateRequest.java @@ -73,9 +73,9 @@ public class UserCreateRequest implements Serializable { @ApiModelProperty(value = "用户备注") private String mark; - @ApiModelProperty(value = "状态是否正常， 0 = 禁止， 1 = 正常") - @NotNull(message = "状态不能为空") - private Boolean status; +// @ApiModelProperty(value = "状态是否正常， 0 = 禁止， 1 = 正常") +// @NotNull(message = "状态不能为空") +// private Boolean status; @ApiModelProperty(value = "详细地址") private String addres; diff --git a/fightwine-common/src/main/java/com/yzt/common/request/UserExtractSearchRequest.java b/fightwine-common/src/main/java/com/yzt/common/request/UserExtractSearchRequest.java index cebb7c6..f2ebb5c 100644 --- a/fightwine-common/src/main/java/com/yzt/common/request/UserExtractSearchRequest.java +++ b/fightwine-common/src/main/java/com/yzt/common/request/UserExtractSearchRequest.java @@ -16,7 +16,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_user_extract") +@TableName("zp_user_extract") @ApiModel(value="UserExtract对象", description="用户提现表") public class UserExtractSearchRequest implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/request/UserGroupRequest.java b/fightwine-common/src/main/java/com/yzt/common/request/UserGroupRequest.java index 57edf0a..0f5d933 100644 --- a/fightwine-common/src/main/java/com/yzt/common/request/UserGroupRequest.java +++ b/fightwine-common/src/main/java/com/yzt/common/request/UserGroupRequest.java @@ -18,7 +18,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_user_group") +@TableName("zp_user_group") @ApiModel(value="UserGroup对象", description="用户分组表") public class UserGroupRequest implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/request/UserSearchRequest.java b/fightwine-common/src/main/java/com/yzt/common/request/UserSearchRequest.java index 6cfc3ec..7da3945 100644 --- a/fightwine-common/src/main/java/com/yzt/common/request/UserSearchRequest.java +++ b/fightwine-common/src/main/java/com/yzt/common/request/UserSearchRequest.java @@ -19,7 +19,6 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_user") @ApiModel(value="User对象", description="用户表") public class UserSearchRequest implements Serializable { @@ -55,9 +54,9 @@ public class UserSearchRequest implements Serializable { private String level; //时间类型 - @ApiModelProperty(value = "访问情况， 0 = 全部， 1 = 首次， 2 = 访问过， 3 = 未访问", allowableValues = "range[0,1,2,3]") - @NotNull(message = "访问情况不能为空") - private Integer accessType = 0; +// @ApiModelProperty(value = "访问情况， 0 = 全部， 1 = 首次， 2 = 访问过， 3 = 未访问", allowableValues = "range[0,1,2,3]") +// @NotNull(message = "访问情况不能为空") +// private Integer accessType = 0; @ApiModelProperty(value = "国家，中国CN，其他OTHER") private String country; diff --git a/fightwine-common/src/main/java/com/yzt/common/request/UserUpdateRequest.java b/fightwine-common/src/main/java/com/yzt/common/request/UserUpdateRequest.java index 2af0704..e9ed664 100644 --- a/fightwine-common/src/main/java/com/yzt/common/request/UserUpdateRequest.java +++ b/fightwine-common/src/main/java/com/yzt/common/request/UserUpdateRequest.java @@ -37,19 +37,19 @@ public class UserUpdateRequest implements Serializable { private String password; // @Size(min = 6, message = "交易密码至少6位" - @Pattern(regexp = "^(.{6,})?$", message = "交易密码至少6位") - @ApiModelProperty(value = "交易密码") - private String tradePassword; +// @Pattern(regexp = "^(.{6,})?$", message = "交易密码至少6位") +// @ApiModelProperty(value = "交易密码") +// private String tradePassword; @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确") @ApiModelProperty(value = "手机号") private String phone; - @ApiModelProperty(value = "推广人id") - private Integer spreadUid; +// @ApiModelProperty(value = "推广人id") +// private Integer spreadUid; - @ApiModelProperty(value = "机构名称") - private String orgName; +// @ApiModelProperty(value = "机构名称") +// private String orgName; @ApiModelProperty(value = "uid") private Integer uid; @@ -66,9 +66,9 @@ public class UserUpdateRequest implements Serializable { @ApiModelProperty(value = "用户备注") private String mark; - @ApiModelProperty(value = "状态是否正常， 0 = 禁止， 1 = 正常") - @NotNull(message = "状态不能为空") - private Boolean status; +// @ApiModelProperty(value = "状态是否正常， 0 = 禁止， 1 = 正常") +// @NotNull(message = "状态不能为空") +// private Boolean status; @ApiModelProperty(value = "详细地址") private String addres; @@ -82,8 +82,8 @@ public class UserUpdateRequest implements Serializable { @ApiModelProperty(value = "用户标签id") private String tagId; - @ApiModelProperty(value = "是否为推广员") - @NotNull(message = "是否为推广员不能为空") - private Boolean isPromoter; +// @ApiModelProperty(value = "是否为推广员") +// @NotNull(message = "是否为推广员不能为空") +// private Boolean isPromoter; } diff --git a/fightwine-common/src/main/java/com/yzt/common/response/UserBillResponse.java b/fightwine-common/src/main/java/com/yzt/common/response/UserBillResponse.java index fbc898f..b59b338 100644 --- a/fightwine-common/src/main/java/com/yzt/common/response/UserBillResponse.java +++ b/fightwine-common/src/main/java/com/yzt/common/response/UserBillResponse.java @@ -21,7 +21,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_user_bill") +@TableName("zp_user_bill") @ApiModel(value="UserBill对象", description="用户账单表") public class UserBillResponse implements Serializable { diff --git a/fightwine-common/src/main/java/com/yzt/common/response/UserCenterResponse.java b/fightwine-common/src/main/java/com/yzt/common/response/UserCenterResponse.java index f702271..99e02ab 100644 --- a/fightwine-common/src/main/java/com/yzt/common/response/UserCenterResponse.java +++ b/fightwine-common/src/main/java/com/yzt/common/response/UserCenterResponse.java @@ -1,5 +1,6 @@ package com.yzt.common.response; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -92,6 +93,9 @@ public class UserCenterResponse implements Serializable { @ApiModelProperty(value = "公司名称") private String tenantName; + @ApiModelProperty(value = "租户名称") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private Long tenantId; @ApiModelProperty(value = "机构名称") private String orgName; diff --git a/fightwine-common/src/main/java/com/yzt/common/vo/TenantVo.java b/fightwine-common/src/main/java/com/yzt/common/vo/TenantVo.java index 4534c3a..615ad99 100644 --- a/fightwine-common/src/main/java/com/yzt/common/vo/TenantVo.java +++ b/fightwine-common/src/main/java/com/yzt/common/vo/TenantVo.java @@ -1,6 +1,7 @@ package com.yzt.common.vo; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -16,6 +17,7 @@ import java.time.LocalDateTime; @Data public class TenantVo { @ApiModelProperty("租户") + @JsonFormat(shape = JsonFormat.Shape.STRING) private Long tenantId; @ApiModelProperty("租户名称") diff --git a/fightwine-common/src/main/java/com/yzt/common/vo/UserSignMonthVo.java b/fightwine-common/src/main/java/com/yzt/common/vo/UserSignMonthVo.java index 65b389c..4fc9998 100644 --- a/fightwine-common/src/main/java/com/yzt/common/vo/UserSignMonthVo.java +++ b/fightwine-common/src/main/java/com/yzt/common/vo/UserSignMonthVo.java @@ -17,7 +17,7 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("fw_user_sign") +@TableName("zp_user_sign") @ApiModel(value="UserSign对象", description="签到记录表") public class UserSignMonthVo implements Serializable { diff --git a/fightwine-service/src/main/java/com/yzt/service/mapper/StoreCartMapper.java b/fightwine-service/src/main/java/com/yzt/service/mapper/StoreCartMapper.java index 4b954a9..5959617 100644 --- a/fightwine-service/src/main/java/com/yzt/service/mapper/StoreCartMapper.java +++ b/fightwine-service/src/main/java/com/yzt/service/mapper/StoreCartMapper.java @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Select; */ public interface StoreCartMapper extends BaseMapper { - @Select("SELECT COUNT(id) FROM fw_store_cart WHERE uid = #{uid} AND status = 1") + @Select("SELECT COUNT(id) FROM zp_store_cart WHERE uid = #{uid} AND status = 1") Integer getCartItemCount(@Param("uid") Integer uid); } diff --git a/fightwine-service/src/main/java/com/yzt/service/service/UserService.java b/fightwine-service/src/main/java/com/yzt/service/service/UserService.java index 79f91cc..6e4f0fc 100644 --- a/fightwine-service/src/main/java/com/yzt/service/service/UserService.java +++ b/fightwine-service/src/main/java/com/yzt/service/service/UserService.java @@ -267,6 +267,12 @@ public interface UserService extends IService { * @return 用户信息 */ User getByPhone(String phone); + /** + * 根据手机号查询用户 + * @param uid id + * @return 用户信息 + */ + UserCenterResponse getByUid(Integer uid); /** * 根据手机号查询用户 diff --git a/fightwine-service/src/main/java/com/yzt/service/service/impl/StoreProductServiceImpl.java b/fightwine-service/src/main/java/com/yzt/service/service/impl/StoreProductServiceImpl.java index 64cffc4..4cf0596 100644 --- a/fightwine-service/src/main/java/com/yzt/service/service/impl/StoreProductServiceImpl.java +++ b/fightwine-service/src/main/java/com/yzt/service/service/impl/StoreProductServiceImpl.java @@ -162,6 +162,9 @@ public class StoreProductServiceImpl extends ServiceImpl i @@ -845,6 +848,9 @@ public class StoreProductServiceImpl extends ServiceImpl cateIds = Arrays.stream(request.getCateId().split(",")).map(Integer::valueOf).distinct().collect(Collectors.toList()); diff --git a/fightwine-service/src/main/java/com/yzt/service/service/impl/UserExtractServiceImpl.java b/fightwine-service/src/main/java/com/yzt/service/service/impl/UserExtractServiceImpl.java index abf2fb7..e683ac0 100644 --- a/fightwine-service/src/main/java/com/yzt/service/service/impl/UserExtractServiceImpl.java +++ b/fightwine-service/src/main/java/com/yzt/service/service/impl/UserExtractServiceImpl.java @@ -746,7 +746,7 @@ public class UserExtractServiceImpl extends ServiceImpl implements Us map.put("uids", request.getUids()); } - if (request.getIsPromoter() != null) { - map.put("isPromoter", request.getIsPromoter() ? 1 : 0); - } - if (StrUtil.isNotBlank(request.getGroupId())) { List groupIdList = YztUtil.stringToArray(request.getGroupId()); map.put("groupIdList", groupIdList); @@ -222,7 +219,7 @@ public class UserServiceImpl extends ServiceImpl implements Us if (!StringUtils.isBlank(dateLimit.getStartTime())) { map.put("startTime", dateLimit.getStartTime()); map.put("endTime", dateLimit.getEndTime()); - map.put("accessType", request.getAccessType()); +// map.put("accessType", request.getAccessType()); } if (request.getKeywords() != null) { map.put("keywords", request.getKeywords()); @@ -1593,12 +1590,12 @@ public class UserServiceImpl extends ServiceImpl implements Us if(userRequest.getPassword().isBlank()){ user.setPwd(tempUser.getPwd()); } - if (userRequest.getTradePassword().isBlank()){ - user.setTradePassword(tempUser.getTradePassword()); - } - if (!tempUser.getIsPromoter() && user.getIsPromoter()) { - user.setPromoterTime(DateUtil.date()); - } +// if (userRequest.getTradePassword().isBlank()){ +// user.setTradePassword(tempUser.getTradePassword()); +// } +// if (!tempUser.getIsPromoter() && user.getIsPromoter()) { +// user.setPromoterTime(DateUtil.date()); +// } user.setUpdateTime(DateUtil.date()); return updateById(user); } @@ -1647,6 +1644,22 @@ public class UserServiceImpl extends ServiceImpl implements Us return userMapper.selectOne(lqw); } + /** + * 根据id查询用户 + * @param uid 用户手机号 + * @return 用户信息 + */ + @Override + public UserCenterResponse getByUid(Integer uid) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(User::getUid, uid); + User user = userMapper.selectOne(lqw); + UserCenterResponse userCenterResponse = new UserCenterResponse(); + BeanUtils.copyProperties(user,userCenterResponse); + userCenterResponse.setTenantName(tenantService.getInfo(user.getTenantId()).getTenantName()); + return userCenterResponse; + } + @Override public UserCenterResponse getUserCenterResponseByPhone(String phone) { User user = getByPhone(phone); diff --git a/fightwine-service/src/main/resources/mapper/record/UserVisitRecordMapper.xml b/fightwine-service/src/main/resources/mapper/record/UserVisitRecordMapper.xml index 216bdfc..1daaa71 100644 --- a/fightwine-service/src/main/resources/mapper/record/UserVisitRecordMapper.xml +++ b/fightwine-service/src/main/resources/mapper/record/UserVisitRecordMapper.xml @@ -4,13 +4,13 @@ diff --git a/fightwine-service/src/main/resources/mapper/user/UserMapper.xml b/fightwine-service/src/main/resources/mapper/user/UserMapper.xml index bb8ce1a..26757d9 100644 --- a/fightwine-service/src/main/resources/mapper/user/UserMapper.xml +++ b/fightwine-service/src/main/resources/mapper/user/UserMapper.xml @@ -4,11 +4,11 @@