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

wuyouming666

2023-12-20 fe6e7ec0a4eab8e9e288e5ac39e11bc3f7fdb32c

 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;