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 ad1ca4c4..640a6a22 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 @@ -63,6 +63,8 @@ public class Goods extends BaseEntity { @Excel(name = "区域Id", cellType = Excel.ColumnType.NUMERIC) private Long areaId; + private Long exceptParentAreaId; + private List goodsAreaList; private Map> goodsImgsMap; diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml index 426b6a56..5fcbf990 100644 --- a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml +++ b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml @@ -30,7 +30,7 @@ SELECT DISTINCT g.goods_id, goods_code, dept_id, goods_name, goods_desc, goods_sort, worker_id, goods_unit, - dept_goods_category_id, goods_img_url, goods_video_url, status, create_by, create_time, remark + dept_goods_category_id, goods_img_url, goods_video_url, status, g.create_by, g.create_time, g.remark FROM goods g LEFT JOIN goods_area ga ON g.goods_id = ga.goods_id @@ -93,6 +93,7 @@