feature：bug修复

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/MaterialDataStaticsController.java

@@ -107,9 +107,9 @@ public class MaterialDataStaticsController {
                 .newMaterialNum(totalMaterialNum)
                 .useMaterialClerkNum(temp.getUseMatlClerkNum())
                 .unUseMaterialClerkNum(temp.getUnusedMatlClerkNum())
-                .conversionAmount(Optional.ofNullable(temp.getConvSalesAmt()).orElse(BigDecimal.ZERO).add(Optional.ofNullable(temp.getOfflineConvSalesAmt()).orElse(BigDecimal.ZERO)))
+                .conversionAmount(temp.getOmniConvSalesAmt())
                 .storeManagerNum(totalManagerStoreNum)
-                .clickUserNum(temp.getClickUserNum() + Optional.ofNullable(temp.getOfflineConvUserNum()).orElse(0))
+                .clickUserNum(temp.getClickUserNum())
                 .offlineConvUserNum(temp.getOfflineConvUserNum())
                 .offlineConvSalesAmt(temp.getOfflineConvSalesAmt())
                 .omniConvSalesAmt(temp.getOmniConvSalesAmt())

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/statistics/MaterialIndexDataVO.java

@@ -34,7 +34,7 @@ public class MaterialIndexDataVO implements Serializable {
     private Integer unUseMaterialClerkNum;
 
     /**
-     * 线上转化金额
+     * 转化金额
      */
     private BigDecimal conversionAmount;
 
@@ -49,7 +49,7 @@ public class MaterialIndexDataVO implements Serializable {
     private Integer storeManagerNum;
 
     /**
-     * 线上转化用户数
+     * 点击客户数
      */
     private Integer clickUserNum;