From 092a98a583c4fe822a3eb4c4dac086f84b16189c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 26 九月 2025 17:58:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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 9cf22fa..368a775 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
@@ -38,16 +38,16 @@
@ApiModelProperty(value = "商品来源 1=平台添加 2=线下添加")
@TableField("goods_source")
- private String goodsSource;
+ private Integer goodsSource;
@ApiModelProperty(value = "商品名称")
@TableField("goods_name")
@Excel(name = "*商品名称")
private String goodsName;
- @ApiModelProperty(value = "商品标识码")
+ @ApiModelProperty(value = "商品条码")
@TableField("goods_id_code")
- @Excel(name = "*商品标识码")
+ @Excel(name = "*商品条码")
private String goodsIdCode;
@ApiModelProperty(value = "国药准字号")
@@ -90,13 +90,18 @@
@TableField("type_id")
private String typeId;
- @ApiModelProperty(value = "商品69码")
+ @ApiModelProperty(value = "商品标识码")
@TableField("goods_yards")
- @Excel(name = "商品69码")
+ @Excel(name = "商品标识码")
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")
@@ -217,7 +222,17 @@
private String storage;
+ @ApiModelProperty(value = "商品条码")
+ private String barcode;
+ @ApiModelProperty(value = "诊所添加供应商")
+ @TableField("supplier_name")
+ private String supplierName;
+
+
+ @ApiModelProperty(value = "诊所id")
+ @TableField("clinic_ids")
+ private String clinicIds;
}
--
Gitblit v1.7.1