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

yyb

7 天以前 c8db0d9987935b82c4a8ca97ce6aaafd19c1f707

 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;