From 206fcf7d6afae27856f63cf0158f53b61fa1b86f Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期五, 19 九月 2025 18:21:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java index 972de08..88cc2f3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java +++ b/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 = "最低采购数量") -- Gitblit v1.7.1