Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

5 天以前 8e941a8eac3329725cdd59cfa2bf3482ccbf057a

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

@@ -45,11 +45,6 @@
    @Excel(name = "辅单位")
    private String subUnit;

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

    @ApiModelProperty(value = "租户ID")
    @TableField(fill = FieldFill.INSERT)