Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

10 天以前 673b492bd661ce815ca09f67531d0895f6b4486d

 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;