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

liyong

7 天以前 ffbe5016cb2426f16b13d58795c523931cb36f08

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