Merge branch 'feature-0524-home-change' into 'master'

好办首页 点击客户数

See merge request !1283

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

@@ -106,6 +106,7 @@ public class MaterialDataStaticsController {
                 .unUseMaterialClerkNum(temp.getUnusedMatlClerkNum())
                 .conversionAmount(Optional.ofNullable(temp.getConvSalesAmt()).orElse(BigDecimal.ZERO))
                 .storeManagerNum(totalManagerStoreNum)
+                .clickUserNum(temp.getClickUserNum())
                 .build();
         return RestResponse.successResult(indexDataVO);
     }

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

@@ -47,4 +47,9 @@ public class MaterialIndexDataVO implements Serializable {
      * 管辖门店数量
      */
     private Integer storeManagerNum;
+
+    /**
+     * 转化用户数
+     */
+    private Integer clickUserNum;
 }

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

@@ -25,7 +25,7 @@ public class MaterialTodayDataBO implements Serializable {
     private Integer unusedMatlClerkNum;
 
     /**
-     * 转化用户数
+     * 点击客户数
      */
     private Integer clickUserNum;