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

wuyouming666

2024-05-09 b58f3ceffa2d8999a5b45e67f6b4c7303b340e7d

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

@@ -21,7 +21,8 @@
    private Long permissionId;
    @ApiModelProperty("状态")
    private Integer state;

    @ApiModelProperty("名字")
    private String name;