Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

clll

2023-10-27 254899911b6ca9b2e6085060902990cff8c84ef0

 springboot-vue3/src/main/java/com/example/springboot/entity/RolePermission.java

@@ -22,8 +22,13 @@
    @ApiModelProperty("状态")
    private Integer state;




    @TableField(exist = false)
    private Role role;
    @TableField(exist = false)
    private Permission permission;


}