Merge remote-tracking branch 'origin/master'

zhoushihao

2024-05-27 7a23bac143166768c577411d68b256fdf85c8bb5

 hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/entity/SysRoleMenu.java

@@ -24,7 +24,7 @@
    /**
     * 角色ID
     */
    @TableId(value = "role_id", type = IdType.AUTO)
    @TableId(type = IdType.NONE)
    private Long roleId;

    /**