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

buhuazhen

4 天以前 4e833109c2105bf6895ac985205ce30da37c70d6

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