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

zhanghua

2023-12-26 0cd9d911b8e8634ec04cb82ea07696bb09260b03

 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;