|
|
@@ -1486,10 +1486,10 @@ public class ProductServiceImpl implements ProductService {
|
|
|
g.setImg(product.getCmpImg());
|
|
|
g.setUuid(product.getCmpUuId());
|
|
|
g.setCode(product.getPcmpcode());
|
|
|
- g.setBrandNameCn(product.getPbrand());
|
|
|
+ g.setBrandNameCn(product.getPbrand() == null ? product.getPbranden() : product.getPbrand());
|
|
|
g.setBrandid(product.getPbrandid());
|
|
|
g.setBranduuid(product.getPbranduuid());
|
|
|
- g.setBrandNameEn(product.getPbranden());
|
|
|
+ g.setBrandNameEn(product.getPbranden() == null ? product.getPbrand() : product.getPbranden());
|
|
|
g.setKindNameCn(product.getKind());
|
|
|
g.setKindUuid(product.getKindid());
|
|
|
g.setCurrencyName(currency);
|