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

maven

2025-12-22 5a5df7b6529a62233bd2541a9abbb7bd588e9a4d

 src/main/java/com/ruoyi/basic/pojo/ProductModel.java

@@ -39,6 +39,12 @@
    @Excel(name = "单位")
    private String unit;

    /**
     * 生产炒机
     */
    @Excel(name = "生产炒机")
    private String speculativeTradingName;

    @ApiModelProperty(value = "租户ID")
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;