Authored by mali

Merge branch 'hotfix1211buyerorderTimeout' into test6.8.3

... ... @@ -174,7 +174,7 @@ public class ProductServiceImpl implements ProductService{
Goods goods = goodsMapper.selectByPrimaryKey(storage.getGoodsId());
if (goods != null) {
resp.setColorId(goods.getColorId().toString());
resp.setColorName(goods.getColorName());
resp.setColorName(StringUtils.isEmpty(goods.getGoodsName()) ? goods.getColorName() : goods.getGoodsName());
resp.setImageUrl(goods.getColorImage());
Product product = productMapper.selectByPrimaryKey(goods.getProductId());
... ...