Merge remote-tracking branch 'origin/master'

xuhy

23 小时以前 206fcf7d6afae27856f63cf0158f53b61fa1b86f

 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java

@@ -96,8 +96,13 @@
    private String goodsYards;

    @Excel(name = "保养周期(天)")
    @TableField("maintenance_interval")
    private String maintenanceInterval;

    @ApiModelProperty(value = "保养周期单位")
    @TableField("maintenance_interval_unit")
    private String maintenanceIntervalUnit;

    @ApiModelProperty(value = "最低采购数量")
    @TableField("low_purchase_quantity")
    @Excel(name = "最低采购数量")