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

zhanghua

2022-10-28 899e021604c2dc1660fe9b240f041f7bef56563b

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

@@ -80,8 +80,12 @@
    @TableField(exist = false)
    private String departName;

    @ApiModelProperty(value = "部门id")
    @TableField(exist = false)
    private Integer departmentId;

    @ApiModelProperty(value = "用户类型")
    private Byte userType;
    private Integer userType;

    @ApiModelProperty(value = "座机/分机")
    private String zj;