Merge remote-tracking branch 'origin/master'

application/master/controller/Journal.php

@@ -400,7 +400,7 @@ class Journal extends Controller
                 ->where("ctime","<",$s_time)
                 ->select();
             $m_p_month_num = 0;
-            foreach ($list1 as $item) {
+            foreach ($list_m_p as $item) {
                 if($item['is_wos']==1){
                     $m_p_month_num++;
                 }