diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurShopProdCategoryServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopProdCategoryServiceImpl.java
index d21a2c4..7535eba 100644
--- a/src/main/java/com/czg/mergedata/cur/service/impl/CurShopProdCategoryServiceImpl.java
+++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopProdCategoryServiceImpl.java
@@ -30,9 +30,6 @@ import java.util.Map;
 @Service
 public class CurShopProdCategoryServiceImpl extends ServiceImpl<CurShopProdCategoryMapper, CurShopProdCategory> implements CurShopProdCategoryService {
 
-    @Resource
-    private CurShopIdRelationService curShopIdRelationService;
-
     @Resource
     private OldShopCategoryService oldShopCategoryService;
 
@@ -41,30 +38,28 @@ public class CurShopProdCategoryServiceImpl extends ServiceImpl<CurShopProdCateg
     public CzgResult<String> mergeData() {
         getMapper().truncateTable();
 
-        Map<Long, Long> oldAndCurShopIdMap = curShopIdRelationService.getOldShopIdRelation();
-
-        execMergeCategory(oldAndCurShopIdMap);
+        execMergeCategory();
         return CzgResult.success("迁移成功");
     }
 
-    private void execMergeCategory(Map<Long, Long> oldAndCurShopIdMap) {
+    private void execMergeCategory() {
         Page<OldShopCategory> page = oldShopCategoryService.page(PageUtils.buildPage());
 
         while (!page.getRecords().isEmpty()) {
-            saveCategory(page.getRecords(), oldAndCurShopIdMap);
+            saveCategory(page.getRecords());
 
             page = oldShopCategoryService.page(PageUtils.buildPage(page.getPageNumber() + 1));
         }
     }
 
-    private void saveCategory(List<OldShopCategory> oldShopCategoryList, Map<Long, Long> oldShopIdMap) {
+    private void saveCategory(List<OldShopCategory> oldShopCategoryList) {
         List<CurShopProdCategory> curShopProdCategories = new ArrayList<>();
 
         for (OldShopCategory oldShopCategory : oldShopCategoryList) {
-            Long shopId = oldShopIdMap.get(Long.valueOf(oldShopCategory.getShopId()));
+            Long shopId = Long.valueOf(oldShopCategory.getShopId());
             CurShopProdCategory curShopProdCategory = new CurShopProdCategory();
             curShopProdCategory.setId(Long.valueOf(oldShopCategory.getId()));
-            curShopProdCategory.setShopId(shopId == null ? 1L : shopId);
+            curShopProdCategory.setShopId(shopId);
             curShopProdCategory.setName(oldShopCategory.getName());
             curShopProdCategory.setShortName(oldShopCategory.getShortName());
             curShopProdCategory.setPid(StrUtil.isBlank(oldShopCategory.getPid()) ? 1L : Long.parseLong(oldShopCategory.getPid()));
diff --git a/收银机数据迁移关系.md b/收银机数据迁移关系.md
index 87615e8..df80e68 100644
--- a/收银机数据迁移关系.md
+++ b/收银机数据迁移关系.md
@@ -90,5 +90,12 @@
 #### 执行表
 - tb_shop_prod_spec   表
 
+### 12. 商品分类
+> /merge/product/mergeCategory
+#### 执行表
+- tb_shop_prod_category   表
+
+
+