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

maven

8 天以前 1f1ef0f62c4953e3ff9c610cda8f3c4f8a45c025

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