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

liujie

100 分钟以前 34e64f1437ed897056bed0c3851e7a46ac220423

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

@@ -31,7 +31,7 @@

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

    @ApiModelProperty(value = "仓库名称")
    @TableField("warehouse_name")