Merge branch 'security_20240424'

zhoushihao

2024-04-28 48be263891d34bfac0417c1e8d047fef673f0900

 hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/entity/SysUserRole.java

@@ -1,5 +1,7 @@
package com.mes.userinfo.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -24,6 +26,7 @@
    /**
     * 用户id
     */
    @TableId(type = IdType.NONE)
    private Long userId;

    /**