Merge branch 'jtwy' into dev_New

zss

21 小时以前 64027e45c5b0d9dfe1a5536f30ca9183af24b456

 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;
}