Merge branch 'jtwy' into dev_New

zss

2 天以前 56c6afb58c29c785b0a363d1dac183c4b1b2e1aa

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