From 47b3dc73a5b9274815a3e3fa631ad911453c84ad Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 05 九月 2025 14:26:12 +0800
Subject: [PATCH] crm
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java | 79 +++++++++++++++++++++++++++++++++++----
1 files changed, 70 insertions(+), 9 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 1ffc9a2..c64a8a7 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
@@ -6,8 +6,10 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.aspectj.weaver.ast.Not;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -29,13 +31,13 @@
@TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
- @ApiModelProperty(value = "供应商id")
- @TableField("supplier_id")
- private String supplierId;
+ @ApiModelProperty(value = "供应商id/诊所id")
+ @TableField("supplier_clinic_id")
+ private String supplierClinicId;
- @ApiModelProperty(value = "诊所id")
- @TableField("clinic_id")
- private String clinicId;
+ @ApiModelProperty(value = "商品来源 1=平台添加 2=线下添加")
+ @TableField("goods_source")
+ private String goodsSource;
@ApiModelProperty(value = "商品名称")
@TableField("goods_name")
@@ -95,7 +97,7 @@
@ApiModelProperty(value = "商品售价")
@TableField("sales_amount")
- private Double salesAmount;
+ private BigDecimal salesAmount;
@ApiModelProperty(value = "包装单位,单位id")
@TableField("packing_unit_id")
@@ -111,11 +113,70 @@
@ApiModelProperty(value = "诊所采购价")
@TableField("clinic_purchase_price")
- private Double clinicPurchasePrice;
+ private BigDecimal clinicPurchasePrice;
@ApiModelProperty(value = "平台分佣金额")
@TableField("platform_commission_price")
- private Double platformCommissionPrice;
+ private BigDecimal platformCommissionPrice;
+
+ @ApiModelProperty(value = "1启用 2禁用")
+ private Integer state;
+
+
+ @ApiModelProperty(value = "商品类型名称")
+ @TableField(exist = false)
+ private String typeName;
+
+ @ApiModelProperty(value = "拼音简码")
+ @TableField("simplified_code")
+ private String simplifiedCode;
+
+ @ApiModelProperty(value = "剂型")
+ @TableField("dosage_form")
+ private String dosageForm;
+
+ @ApiModelProperty(value = "用途分类")
+ @TableField("usage_classification")
+ private String usageClassification;
+
+ @ApiModelProperty(value = "商品品牌名")
+ @TableField("product_brand")
+ private String productBrand;
+
+ @ApiModelProperty(value = "产地")
+ @TableField("place_of_origin")
+ private String placeOfOrigin;
+
+ @ApiModelProperty(value = "成分")
+ @TableField("ingredient")
+ private String ingredient;
+
+ @ApiModelProperty(value = "性状")
+ @TableField("trait")
+ private String trait;
+
+ @ApiModelProperty(value = "适应症")
+ @TableField("indication")
+ private String indication;
+
+ @ApiModelProperty(value = "禁忌")
+ @TableField("taboo")
+ private String taboo;
+
+ @ApiModelProperty(value = "注意事项")
+ @TableField("precautions")
+ private String precautions;
+
+ @ApiModelProperty(value = "相互作用")
+ @TableField("interaction")
+ private String interaction;
+
+ @ApiModelProperty(value = "贮藏")
+ @TableField("storage")
+ private String storage;
+
+
+
}
--
Gitblit v1.7.1