Merge remote-tracking branch 'origin/developer' into developer

src/main/java/com/caimei365/tools/controller/BaseApi.java

@@ -97,8 +97,8 @@ public class BaseApi {
      */
     /*@GetMapping("/base/oldData")
     public void oldData(String dateTime) {
-//        cmBehaviorRecordService.insertBehaviorUser(dateTime);
-        cmBehaviorRecordService.insertTodayData();
+//        cmBehaviorRecordService.pageStatistics(dateTime);
+//        cmBehaviorRecordService.insertTodayData();
     }*/
 
     @ApiOperation("获取小程序二维码图片")