修改角色管理中权限分配 新增登录日志表
修改 @Create 标识为 @since
This commit is contained in:
		@@ -1,8 +1,8 @@
 | 
			
		||||
package com.yovinchen.xlcs.model.acl;
 | 
			
		||||
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableField;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableName;
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import io.swagger.annotations.ApiModel;
 | 
			
		||||
import io.swagger.annotations.ApiModelProperty;
 | 
			
		||||
import lombok.Data;
 | 
			
		||||
@@ -12,8 +12,8 @@ import lombok.Data;
 | 
			
		||||
 * 用户
 | 
			
		||||
 * </p>
 | 
			
		||||
 *
 | 
			
		||||
 * @author qy
 | 
			
		||||
 * @since 2019-11-08
 | 
			
		||||
 * @author yovinchen
 | 
			
		||||
 * @since 2023-09-21
 | 
			
		||||
 */
 | 
			
		||||
@Data
 | 
			
		||||
@ApiModel(description = "用户")
 | 
			
		||||
 
 | 
			
		||||
@@ -0,0 +1,40 @@
 | 
			
		||||
package com.yovinchen.xlcs.model.acl;
 | 
			
		||||
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableField;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableName;
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import io.swagger.annotations.ApiModel;
 | 
			
		||||
import io.swagger.annotations.ApiModelProperty;
 | 
			
		||||
import lombok.Data;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * <p>
 | 
			
		||||
 * 后台用户登录日志表
 | 
			
		||||
 * </p>
 | 
			
		||||
 *
 | 
			
		||||
 * @author yovinchen
 | 
			
		||||
 * @since 2024-01-24
 | 
			
		||||
 */
 | 
			
		||||
@Data
 | 
			
		||||
@ApiModel(description = "后台用户登录日志表")
 | 
			
		||||
@TableName("admin_login_log")
 | 
			
		||||
public class AdminLoginLog extends BaseEntity {
 | 
			
		||||
 | 
			
		||||
    private static final long serialVersionUID = 1L;
 | 
			
		||||
 | 
			
		||||
    @ApiModelProperty(value = "用户id")
 | 
			
		||||
    @TableField("admin_id")
 | 
			
		||||
    private Long adminId;
 | 
			
		||||
 | 
			
		||||
    @ApiModelProperty(value = "IP地址")
 | 
			
		||||
    @TableField("ip")
 | 
			
		||||
    private String ip;
 | 
			
		||||
 | 
			
		||||
    @ApiModelProperty(value = "地址")
 | 
			
		||||
    @TableField("address")
 | 
			
		||||
    private String address;
 | 
			
		||||
 | 
			
		||||
    @ApiModelProperty(value = "浏览器登录类型")
 | 
			
		||||
    @TableField("user_agent")
 | 
			
		||||
    private String userAgent;
 | 
			
		||||
}
 | 
			
		||||
@@ -1,8 +1,8 @@
 | 
			
		||||
package com.yovinchen.xlcs.model.acl;
 | 
			
		||||
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableField;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableName;
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import io.swagger.annotations.ApiModel;
 | 
			
		||||
import io.swagger.annotations.ApiModelProperty;
 | 
			
		||||
import lombok.Data;
 | 
			
		||||
@@ -12,8 +12,8 @@ import lombok.Data;
 | 
			
		||||
 * 用户角色
 | 
			
		||||
 * </p>
 | 
			
		||||
 *
 | 
			
		||||
 * @author qy
 | 
			
		||||
 * @since 2019-11-08
 | 
			
		||||
 * @author yovinchen
 | 
			
		||||
 * @since 2023-09-21
 | 
			
		||||
 */
 | 
			
		||||
@Data
 | 
			
		||||
@ApiModel(description = "用户角色")
 | 
			
		||||
 
 | 
			
		||||
@@ -2,9 +2,9 @@
 | 
			
		||||
//
 | 
			
		||||
package com.yovinchen.xlcs.model.acl;
 | 
			
		||||
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableField;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableName;
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import io.swagger.annotations.ApiModel;
 | 
			
		||||
import io.swagger.annotations.ApiModelProperty;
 | 
			
		||||
import lombok.Data;
 | 
			
		||||
@@ -16,8 +16,8 @@ import java.util.List;
 | 
			
		||||
 * 权限
 | 
			
		||||
 * </p>
 | 
			
		||||
 *
 | 
			
		||||
 * @author qy
 | 
			
		||||
 * @since 2019-11-08
 | 
			
		||||
 * @author yovinchen
 | 
			
		||||
 * @since 2023-09-21
 | 
			
		||||
 */
 | 
			
		||||
@Data
 | 
			
		||||
@ApiModel(description = "权限")
 | 
			
		||||
 
 | 
			
		||||
@@ -2,9 +2,9 @@
 | 
			
		||||
//
 | 
			
		||||
package com.yovinchen.xlcs.model.acl;
 | 
			
		||||
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableField;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableName;
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import io.swagger.annotations.ApiModel;
 | 
			
		||||
import io.swagger.annotations.ApiModelProperty;
 | 
			
		||||
import lombok.Data;
 | 
			
		||||
@@ -14,8 +14,8 @@ import lombok.Data;
 | 
			
		||||
 * 角色
 | 
			
		||||
 * </p>
 | 
			
		||||
 *
 | 
			
		||||
 * @author qy
 | 
			
		||||
 * @since 2019-11-08
 | 
			
		||||
 * @author yovinchen
 | 
			
		||||
 * @since 2023-09-21
 | 
			
		||||
 */
 | 
			
		||||
@Data
 | 
			
		||||
@ApiModel(description = "角色")
 | 
			
		||||
 
 | 
			
		||||
@@ -2,9 +2,9 @@
 | 
			
		||||
//
 | 
			
		||||
package com.yovinchen.xlcs.model.acl;
 | 
			
		||||
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableField;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableName;
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import io.swagger.annotations.ApiModel;
 | 
			
		||||
import io.swagger.annotations.ApiModelProperty;
 | 
			
		||||
import lombok.Data;
 | 
			
		||||
@@ -14,8 +14,8 @@ import lombok.Data;
 | 
			
		||||
 * 角色权限
 | 
			
		||||
 * </p>
 | 
			
		||||
 *
 | 
			
		||||
 * @author qy
 | 
			
		||||
 * @since 2019-11-08
 | 
			
		||||
 * @author yovinchen
 | 
			
		||||
 * @since 2023-09-21
 | 
			
		||||
 */
 | 
			
		||||
@Data
 | 
			
		||||
@ApiModel(description = "角色权限")
 | 
			
		||||
 
 | 
			
		||||
@@ -1,10 +1,10 @@
 | 
			
		||||
package com.yovinchen.xlcs.model.activity;
 | 
			
		||||
 | 
			
		||||
import com.yovinchen.xlcs.enums.ActivityType;
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableField;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableName;
 | 
			
		||||
import com.fasterxml.jackson.annotation.JsonFormat;
 | 
			
		||||
import com.yovinchen.xlcs.enums.ActivityType;
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import io.swagger.annotations.ApiModel;
 | 
			
		||||
import io.swagger.annotations.ApiModelProperty;
 | 
			
		||||
import lombok.Data;
 | 
			
		||||
@@ -16,7 +16,7 @@ import java.util.Date;
 | 
			
		||||
 * ActivityInfo
 | 
			
		||||
 * </p>
 | 
			
		||||
 *
 | 
			
		||||
 * @author qy
 | 
			
		||||
 * @author yovinchen
 | 
			
		||||
 */
 | 
			
		||||
@Data
 | 
			
		||||
@ApiModel(description = "ActivityInfo")
 | 
			
		||||
 
 | 
			
		||||
@@ -1,9 +1,9 @@
 | 
			
		||||
package com.yovinchen.xlcs.model.activity;
 | 
			
		||||
 | 
			
		||||
import com.yovinchen.xlcs.enums.ActivityType;
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableField;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableName;
 | 
			
		||||
import com.yovinchen.xlcs.enums.ActivityType;
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import io.swagger.annotations.ApiModel;
 | 
			
		||||
import io.swagger.annotations.ApiModelProperty;
 | 
			
		||||
import lombok.Data;
 | 
			
		||||
@@ -15,7 +15,7 @@ import java.math.BigDecimal;
 | 
			
		||||
 * ActivityRule
 | 
			
		||||
 * </p>
 | 
			
		||||
 *
 | 
			
		||||
 * @author qy
 | 
			
		||||
 * @author yovinchen
 | 
			
		||||
 */
 | 
			
		||||
@Data
 | 
			
		||||
@ApiModel(description = "ActivityRule")
 | 
			
		||||
 
 | 
			
		||||
@@ -1,8 +1,8 @@
 | 
			
		||||
package com.yovinchen.xlcs.model.activity;
 | 
			
		||||
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableField;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableName;
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import io.swagger.annotations.ApiModel;
 | 
			
		||||
import io.swagger.annotations.ApiModelProperty;
 | 
			
		||||
import lombok.Data;
 | 
			
		||||
@@ -12,7 +12,7 @@ import lombok.Data;
 | 
			
		||||
 * ActivitySku
 | 
			
		||||
 * </p>
 | 
			
		||||
 *
 | 
			
		||||
 * @author qy
 | 
			
		||||
 * @author yovinchen
 | 
			
		||||
 */
 | 
			
		||||
@Data
 | 
			
		||||
@ApiModel(description = "ActivitySku")
 | 
			
		||||
 
 | 
			
		||||
@@ -1,9 +1,9 @@
 | 
			
		||||
package com.yovinchen.xlcs.model.activity;
 | 
			
		||||
 | 
			
		||||
import com.yovinchen.xlcs.enums.CouponRangeType;
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableField;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableName;
 | 
			
		||||
import com.yovinchen.xlcs.enums.CouponRangeType;
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import io.swagger.annotations.ApiModel;
 | 
			
		||||
import io.swagger.annotations.ApiModelProperty;
 | 
			
		||||
import lombok.Data;
 | 
			
		||||
@@ -13,7 +13,7 @@ import lombok.Data;
 | 
			
		||||
 * CouponRange
 | 
			
		||||
 * </p>
 | 
			
		||||
 *
 | 
			
		||||
 * @author qy
 | 
			
		||||
 * @author yovinchen
 | 
			
		||||
 */
 | 
			
		||||
@Data
 | 
			
		||||
@ApiModel(description = "CouponRange")
 | 
			
		||||
 
 | 
			
		||||
@@ -1,9 +1,9 @@
 | 
			
		||||
package com.yovinchen.xlcs.model.activity;
 | 
			
		||||
 | 
			
		||||
import com.yovinchen.xlcs.enums.CouponStatus;
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableField;
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableName;
 | 
			
		||||
import com.yovinchen.xlcs.enums.CouponStatus;
 | 
			
		||||
import com.yovinchen.xlcs.model.base.BaseEntity;
 | 
			
		||||
import io.swagger.annotations.ApiModel;
 | 
			
		||||
import io.swagger.annotations.ApiModelProperty;
 | 
			
		||||
import lombok.Data;
 | 
			
		||||
@@ -15,7 +15,7 @@ import java.util.Date;
 | 
			
		||||
 * CouponUse
 | 
			
		||||
 * </p>
 | 
			
		||||
 *
 | 
			
		||||
 * @author qy
 | 
			
		||||
 * @author yovinchen
 | 
			
		||||
 */
 | 
			
		||||
@Data
 | 
			
		||||
@ApiModel(description = "优惠券领取记录表")
 | 
			
		||||
 
 | 
			
		||||
@@ -13,8 +13,8 @@ import java.io.Serializable;
 | 
			
		||||
 * 用户查询实体
 | 
			
		||||
 * </p>
 | 
			
		||||
 *
 | 
			
		||||
 * @author qy
 | 
			
		||||
 * @since 2019-11-08
 | 
			
		||||
 * @author yovinchen
 | 
			
		||||
 * @since 2023-09-21
 | 
			
		||||
 */
 | 
			
		||||
@Data
 | 
			
		||||
@ApiModel(description = "用户查询实体")
 | 
			
		||||
 
 | 
			
		||||
@@ -13,8 +13,8 @@ import java.io.Serializable;
 | 
			
		||||
 * 角色查询实体
 | 
			
		||||
 * </p>
 | 
			
		||||
 *
 | 
			
		||||
 * @author qy
 | 
			
		||||
 * @since 2019-11-08
 | 
			
		||||
 * @author yovinchen
 | 
			
		||||
 * @since 2023-09-21
 | 
			
		||||
 */
 | 
			
		||||
@Data
 | 
			
		||||
@ApiModel(description = "角色查询实体")
 | 
			
		||||
 
 | 
			
		||||
@@ -13,7 +13,7 @@ import java.util.List;
 | 
			
		||||
 * OrderDetailActivity
 | 
			
		||||
 * </p>
 | 
			
		||||
 *
 | 
			
		||||
 * @author qy
 | 
			
		||||
 * @author yovinchen
 | 
			
		||||
 */
 | 
			
		||||
@Data
 | 
			
		||||
public class CartInfoVo implements Serializable {
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
package com.yovinchen.xlcs.vo.order;
 | 
			
		||||
 | 
			
		||||
import com.yovinchen.xlcs.vo.user.LeaderAddressVo;
 | 
			
		||||
import com.yovinchen.xlcs.model.activity.CouponInfo;
 | 
			
		||||
import com.yovinchen.xlcs.vo.user.LeaderAddressVo;
 | 
			
		||||
import io.swagger.annotations.ApiModelProperty;
 | 
			
		||||
import lombok.Data;
 | 
			
		||||
 | 
			
		||||
@@ -14,7 +14,7 @@ import java.util.List;
 | 
			
		||||
 * OrderDetailActivity
 | 
			
		||||
 * </p>
 | 
			
		||||
 *
 | 
			
		||||
 * @author qy
 | 
			
		||||
 * @author yovinchen
 | 
			
		||||
 */
 | 
			
		||||
@Data
 | 
			
		||||
public class OrderConfirmVo implements Serializable {
 | 
			
		||||
 
 | 
			
		||||
@@ -12,7 +12,7 @@ import java.util.List;
 | 
			
		||||
 * OrderDetailActivity
 | 
			
		||||
 * </p>
 | 
			
		||||
 *
 | 
			
		||||
 * @author qy
 | 
			
		||||
 * @author yovinchen
 | 
			
		||||
 */
 | 
			
		||||
@Data
 | 
			
		||||
public class OrderMqVo implements Serializable {
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,5 @@
 | 
			
		||||
package com.yovinchen.xlcs.vo.user;
 | 
			
		||||
 | 
			
		||||
import com.baomidou.mybatisplus.annotation.TableField;
 | 
			
		||||
import io.swagger.annotations.ApiModel;
 | 
			
		||||
import io.swagger.annotations.ApiModelProperty;
 | 
			
		||||
import lombok.Data;
 | 
			
		||||
@@ -10,7 +9,7 @@ import lombok.Data;
 | 
			
		||||
 * UserAddress
 | 
			
		||||
 * </p>
 | 
			
		||||
 *
 | 
			
		||||
 * @author qy
 | 
			
		||||
 * @author yovinchen
 | 
			
		||||
 */
 | 
			
		||||
@Data
 | 
			
		||||
@ApiModel(description = "用户地址")
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user