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

liujie

3 天以前 b2eaab4acba9cff12027caaa9203b81ece4cb5cc

 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")