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

maven

9 天以前 da5094f2b971076db2b09faf78ee6fc65e35f7c7

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