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

yaowanxin

8 天以前 d4b9db2b8958355b9960d57088af9865bb2b2f0d

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