Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2023-10-26 8c80a8d7d70d0aa19fe194df49c21a88d2ba7589

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

@@ -53,6 +53,8 @@

    private Integer sort;

    private String code;

    @ApiModelProperty(value = "角色类型文本")
    @TableField(exist = false)
    private String typeText;