merge:首页周活跃人数统计merge to rc

src/modules/home/Home.less

@@ -28,15 +28,9 @@
     font-family: 'number';
     src: url('https://image.xiaomaiketang.com/xm/n2sADd2jY6.TTF');
   }
-<<<<<<< HEAD
-
-  .data-wrap{
-    background: #FFF;
-=======
   .data-wrap {
     background: #fff;
     padding-bottom: 25px;
->>>>>>> feature/pangguoming/20210701/active_students_number
     .data-box {
       display: flex;
       justify-content: space-between;