Merge remote-tracking branch 'origin/dev_New' into dev_New

yaowanxin

22 小时以前 6f888b234148d1a4dbd1e6c28a8d9ed85ebfda09

 src/main/java/com/ruoyi/basic/pojo/Product.java

@@ -28,5 +28,5 @@

    @ApiModelProperty(value = "租户ID")
    @TableField(fill = FieldFill.INSERT)
    private Integer tenantId;
    private Long tenantId;
}