Merge remote-tracking branch 'origin/dev_天津_奇缘恒艺' into dev_天津_奇缘恒艺

gaoluyang

2026-10-09 fc9020ef61c80338f49af4f998b15f1f8a3835fa

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

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

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

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