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

liyong

4 天以前 877504ede165b8c965b6cf6599708e7e48778034

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