Merge branch 'dev_New' into dev_New_kthg

zss

10 天以前 d5dc454e86e78abd6ca859bb9b0a4c096d743b3b

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