Merge branch 'jtwy' into dev_New

zss

22 小时以前 2757f1d46f388f684aad93b3dc7ad805c45c6248

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