Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

5 天以前 f8d30932873605f5eb407228b22a38ec5ff96af9

 ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmSalesperson.java

@@ -32,7 +32,7 @@

    @ApiModelProperty(value = "后台用户id")
    @TableField("user_id")
    private Integer userId;
    private Long userId;

    @ApiModelProperty(value = "业务员名称")
    @TableField("salesperson_name")