Merge branch 'jtwy' into dev_New

zss

14 小时以前 fc830b7f62af651acedb8c11f1e2634fe2a3e497

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