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

云

3 天以前 b701cf0331e91900bf8055009a745d4953a6c510

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