diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/user/domain/UserAddr.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/user/domain/UserAddr.java index c4cce71..27480d8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/user/domain/UserAddr.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/user/domain/UserAddr.java @@ -54,33 +54,8 @@ public class UserAddr extends BaseEntity { @ApiModelProperty(value = "地址全称") private String addrFullName; - /** openid */ - @Excel(name = "openid") - @ApiModelProperty(value = "openid") - private String openid; - - /** 来源类型 1-钉钉 2-微信 3-小程序 */ - @Excel(name = "来源类型 1-钉钉 2-微信 3-小程序") - @ApiModelProperty(value = "来源类型 1-钉钉 2-微信 3-小程序") - private Long sourceType; - /** 是否默认 1-是,2-否 */ @Excel(name = "是否默认 1-是,2-否") @ApiModelProperty(value = "是否默认 1-是,2-否") private Long ifDefault; - - /** 乐观锁 */ - @Excel(name = "乐观锁") - @ApiModelProperty(value = "乐观锁") - private Long revision; - - /** 位置信息id */ - @Excel(name = "位置信息id") - @ApiModelProperty(value = "位置信息id") - private Long placeId; - - /** 删除标志(0代表存在 2代表删除) */ - private String delFlag; - - } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/user/UserAddrMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/user/UserAddrMapper.xml index bd6d124..e6d8583 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/user/UserAddrMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/user/UserAddrMapper.xml @@ -11,20 +11,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - select user_id, addr_id, contact_name, mobile, area_code, detail_addr, addr_full_name, openid, source_type, if_default, revision, place_id, create_by, create_time, update_by, update_time, del_flag from user_addr + select user_id, addr_id, contact_name, mobile, area_code, detail_addr, addr_full_name, + if_default, create_by, create_time, update_by, update_time + from user_addr @@ -59,16 +52,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" area_code, detail_addr, addr_full_name, - openid, - source_type, if_default, - revision, - place_id, create_by, create_time, update_by, update_time, - del_flag, #{userId}, @@ -77,16 +65,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{areaCode}, #{detailAddr}, #{addrFullName}, - #{openid}, - #{sourceType}, #{ifDefault}, - #{revision}, - #{placeId}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, - #{delFlag}, @@ -99,16 +82,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" area_code = #{areaCode}, detail_addr = #{detailAddr}, addr_full_name = #{addrFullName}, - openid = #{openid}, - source_type = #{sourceType}, if_default = #{ifDefault}, - revision = #{revision}, - place_id = #{placeId}, create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, - del_flag = #{delFlag}, where addr_id = #{addrId}