Merge remote-tracking branch 'origin/master' into master

wl

2022-10-17 d46beba25ccb64a1047a98d642b6ce45e82f0bee

 ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java

@@ -36,7 +36,7 @@
    private String name;

    @ApiModelProperty(value = "角色类型")
    private String type;
    private Long type;

    @ApiModelProperty(value = "描述")
    private String description;