Merge remote-tracking branch 'origin/master' into pim_zss

zss

2025-08-14 03df670a1dfbcae8031e84e15dff0b77365f0af6

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