Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

ZengTao

2024-11-01 7ac0936473cfa23ed0fcb3290d2d12fda1ba2411

 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;

    /**