Merge remote-tracking branch 'origin/master'

xuhy

1 天以前 206fcf7d6afae27856f63cf0158f53b61fa1b86f

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