diff --git a/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java b/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java
index 8257ad62..1819e503 100644
--- a/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java
+++ b/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java
@@ -30,6 +30,8 @@ public class Goods extends BaseEntity {
@Excel(name = "名称")
private String goodsName;
+ private String goodsDesc;
+
@Excel(name = "商品排序", cellType = Excel.ColumnType.NUMERIC)
private Integer goodsSort;
diff --git a/ghy-goods/src/main/java/com/ghy/goods/domain/GoodsStandard.java b/ghy-goods/src/main/java/com/ghy/goods/domain/GoodsStandard.java
index 4517a8a0..f0e30f44 100644
--- a/ghy-goods/src/main/java/com/ghy/goods/domain/GoodsStandard.java
+++ b/ghy-goods/src/main/java/com/ghy/goods/domain/GoodsStandard.java
@@ -32,6 +32,8 @@ public class GoodsStandard extends BaseEntity {
@Excel(name = "库存")
private Integer goodsNum;
+ private String goodsUnit;
+
private Integer saleNum;
private Integer status;
diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
index e2e1042b..8e926c42 100644
--- a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
+++ b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
@@ -8,6 +8,7 @@
+
@@ -22,12 +23,12 @@
- SELECT goods_id, goods_code, dept_id, goods_name, goods_sort, worker_id,
+ SELECT goods_id, goods_code, dept_id, goods_name, goods_desc, goods_sort, worker_id,
dept_goods_category_id, goods_img_url, goods_video_url, status, create_by, create_time, remark
FROM goods
- SELECT DISTINCT g.goods_id, goods_code, dept_id, goods_name, goods_sort, worker_id,
+ SELECT DISTINCT g.goods_id, goods_code, dept_id, goods_name, goods_desc, goods_sort, worker_id,
dept_goods_category_id, goods_img_url, goods_video_url, status, create_by, create_time, remark
FROM goods g
LEFT JOIN goods_area ga ON g.goods_id = ga.goods_id
@@ -60,6 +61,7 @@
goods_code,
dept_id,
goods_name,
+ goods_desc,
goods_sort,
worker_id,
dept_goods_category_id,
@@ -73,6 +75,7 @@
#{goodsCode},
#{deptId},
#{goodsName},
+ #{goodsDesc},
#{goodsSort},
#{workerId},
#{deptGoodsCategoryId},
diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsStandardMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsStandardMapper.xml
index fb6ed43f..236c0726 100644
--- a/ghy-goods/src/main/resources/mapper/goods/GoodsStandardMapper.xml
+++ b/ghy-goods/src/main/resources/mapper/goods/GoodsStandardMapper.xml
@@ -11,6 +11,7 @@
+
@@ -30,6 +31,7 @@
discount_price,
group_price,
goods_num,
+ goods_unit,
create_by,
create_time,
sale_num,
@@ -77,13 +79,13 @@
INSERT INTO goods_standard (
- goods_standard_name, goods_id, dept_goods_category_id, goods_price, discount_price, group_price, goods_num,
+ goods_standard_name, goods_id, dept_goods_category_id, goods_price, discount_price, group_price, goods_unit, goods_num,
sale_num, status, remark, create_by, create_time )
VALUES
(
#{goodsStandard.goodsStandardName}, #{goodsStandard.goodsId}, #{goodsStandard.deptGoodsCategoryId}, #{goodsStandard.goodsPrice}, #{goodsStandard.discountPrice},
- #{goodsStandard.groupPrice}, 100, 0, #{goodsStandard.status}, #{goodsStandard.remark}, #{goodsStandard.createBy}, sysdate()
+ #{goodsStandard.groupPrice}, #{goodsStandard.goodsUnit}, 100, 0, #{goodsStandard.status}, #{goodsStandard.remark}, #{goodsStandard.createBy}, sysdate()
)
@@ -98,4 +100,4 @@
DELETE FROM goods_standard
WHERE goods_id = #{goodsId}
-
\ No newline at end of file
+