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

gongchunyi

2 天以前 cca82e1212056b0ec17e038912f3b0c2ba1e9c61

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