From 9ee5b4515a5355b7f94a7a551922744d5eeba020 Mon Sep 17 00:00:00 2001
From: pikachu <1321288662@qq.com>
Date: Tue, 13 Jul 2021 19:55:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=AF=E5=88=86=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/goods/entity/vos/GoodsParamsGroupVO.java   |  2 +-
 .../vos/{GoodsParamsDTOVO.java => GoodsParamsVO.java}  |  2 +-
 .../modules/goods/serviceimpl/CategoryServiceImpl.java | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename framework/src/main/java/cn/lili/modules/goods/entity/vos/{GoodsParamsDTOVO.java => GoodsParamsVO.java} (95%)

diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsGroupVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsGroupVO.java
index 9202f953..18d0a9d5 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsGroupVO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsGroupVO.java
@@ -16,7 +16,7 @@ import java.util.List;
 public class GoodsParamsGroupVO implements Serializable {
     private static final long serialVersionUID = 1450550797436233753L;
     @ApiModelProperty("参数组关联的参数集合")
-    private List<GoodsParamsDTOVO> params;
+    private List<GoodsParamsVO> params;
     @ApiModelProperty("参数组名称")
     private String groupName;
     @ApiModelProperty("参数组id")
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsDTOVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsVO.java
similarity index 95%
rename from framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsDTOVO.java
rename to framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsVO.java
index 64deda4f..8b9a41e4 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsDTOVO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsVO.java
@@ -12,7 +12,7 @@ import lombok.Data;
  * @date 2020-02-26 23:24:13
  */
 @Data
-public class GoodsParamsDTOVO extends GoodsParamsDTO {
+public class GoodsParamsVO extends GoodsParamsDTO {
 
     private static final long serialVersionUID = -4904700751774005326L;
     @ApiModelProperty("1 输入项   2 选择项")
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java
index 93903d48..bc102fca 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java
@@ -9,7 +9,7 @@ import cn.lili.modules.goods.entity.dos.Category;
 import cn.lili.modules.goods.entity.dos.CategoryParameterGroup;
 import cn.lili.modules.goods.entity.vos.CategoryVO;
 import cn.lili.modules.goods.entity.vos.GoodsParamsGroupVO;
-import cn.lili.modules.goods.entity.vos.GoodsParamsDTOVO;
+import cn.lili.modules.goods.entity.vos.GoodsParamsVO;
 import cn.lili.modules.goods.mapper.CategoryMapper;
 import cn.lili.modules.goods.service.CategoryService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -268,13 +268,13 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
      * @param paramList 参数列表
      * @return 拼装后的返回值
      */
-    private List<GoodsParamsGroupVO> convertParamList(List<CategoryParameterGroup> groupList, List<GoodsParamsDTOVO> paramList) {
-        Map<String, List<GoodsParamsDTOVO>> map = new HashMap<>(16);
-        for (GoodsParamsDTOVO param : paramList) {
+    private List<GoodsParamsGroupVO> convertParamList(List<CategoryParameterGroup> groupList, List<GoodsParamsVO> paramList) {
+        Map<String, List<GoodsParamsVO>> map = new HashMap<>(16);
+        for (GoodsParamsVO param : paramList) {
             if (map.get(param.getGroupId()) != null) {
                 map.get(param.getGroupId()).add(param);
             } else {
-                List<GoodsParamsDTOVO> list = new ArrayList<>();
+                List<GoodsParamsVO> list = new ArrayList<>();
                 list.add(param);
                 map.put(param.getGroupId(), list);
             }