Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintDetectInfoServiceImpl.java

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -2012,7 +2012,11 @@ public class AdminCustomerController {
             row.createCell(11).setCellValue(customerStatisticalInfo.getCustomerIsSolve() == null ? null : customerStatisticalInfo.getCustomerIsSolve());
             row.createCell(12).setCellValue(customerStatisticalInfo.getCompanyName() == null ? null : customerStatisticalInfo.getCompanyName());
             row.createCell(13).setCellValue(customerStatisticalInfo.getStoreName() == null ? null : customerStatisticalInfo.getStoreName());
-            row.createCell(14).setCellValue(customerStatisticalInfo.getItemProductName() == null ? null : customerStatisticalInfo.getItemProductName());
+            if(customerStatisticalInfo.getItemProductName() == null || customerStatisticalInfo.getItemProductColor() == null|| customerStatisticalInfo.getItemNum() == null){
+                row.createCell(14).setCellValue("");
+            }else{
+                row.createCell(14).setCellValue(customerStatisticalInfo.getItemProductName()+"("+customerStatisticalInfo.getItemProductColor()+")"+"*"+customerStatisticalInfo.getItemNum());
+            }
             row.createCell(15).setCellValue(customerStatisticalInfo.getItemProductColor() == null ? null : customerStatisticalInfo.getItemProductColor());
             row.createCell(16).setCellValue(customerStatisticalInfo.getItemNum() == null ? null : customerStatisticalInfo.getItemNum());
             row.createCell(17).setCellValue(backLogisticsCompany);