Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

yuan

18 小时以前 fb40c4dfec5954c321f38bb86e9d07eb87b97bfd

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