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

wuyouming666

2023-12-14 2a6d8a858ca7e41436548b35db147b5cdad4e4be

 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;