feature：好班首页数据

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))
+                .conversionAmount(Optional.ofNullable(temp.getConvSalesAmt()).orElse(BigDecimal.ZERO).add(Optional.ofNullable(temp.getOfflineConvSalesAmt()).orElse(BigDecimal.ZERO)))
                 .storeManagerNum(totalManagerStoreNum)
-                .clickUserNum(temp.getClickUserNum())
+                .clickUserNum(temp.getClickUserNum() + Optional.ofNullable(temp.getOfflineConvUserNum()).orElse(0))
                 .offlineConvUserNum(temp.getOfflineConvUserNum())
                 .offlineConvSalesAmt(temp.getOfflineConvSalesAmt())
                 .omniConvSalesAmt(temp.getOmniConvSalesAmt())