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

liyong

5 天以前 f5624a59380db70633eebe3612e2d3c703012b41

 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;