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

liding

5 天以前 1284fb157043e488aa1794d8f1b64ebf18aa5147

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