记得上下班打卡 | git大法好,push需谨慎

Commit 8b409da7 authored by 胡佳晨's avatar 胡佳晨

Merge remote-tracking branch 'origin/hjc_goblin_version2' into hjc_goblin_version2

parents 67fed25f 2c27fc67
...@@ -280,7 +280,7 @@ public class GoblinStoreMgtGoodsController { ...@@ -280,7 +280,7 @@ public class GoblinStoreMgtGoodsController {
{// 标签处理 {// 标签处理
List<String> goodsTagIdList = storeMgtGoodsAddParam.getTagList(), List<String> goodsTagIdList = storeMgtGoodsAddParam.getTagList(),
goodsExtagIdList = storeMgtGoodsAddParam.getExtagList(), goodsExtagIdList = storeMgtGoodsAddParam.getExtagList(),
goodsArtagIdList = storeMgtGoodsAddParam.getExtagList(); goodsArtagIdList = storeMgtGoodsAddParam.getArtagList();
if (!CollectionUtils.isEmpty(goodsTagIdList)) { if (!CollectionUtils.isEmpty(goodsTagIdList)) {
List<GoblinSelfTagVo> selfGoodsTagVos = goblinRedisUtils.getSelfTagVos(); List<GoblinSelfTagVo> selfGoodsTagVos = goblinRedisUtils.getSelfTagVos();
List<GoblinGoodsTagVo> goodsTagVoList = ObjectUtil.getGoblinGoodsTagVoArrayList(); List<GoblinGoodsTagVo> goodsTagVoList = ObjectUtil.getGoblinGoodsTagVoArrayList();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment