Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 8635f0ece99df340535466e9b6207c6ecf1b8a4d

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