Merge branch 'sprint/xuanxuan_108' into 'master'

合并小喧喧通知卡片相关代码

See merge request easycorp/zentaopms!4452

module/action/model.php

@@ -73,7 +73,7 @@ class actionModel extends model
         if($this->post->uid) $this->file->updateObjectID($this->post->uid, $objectID, $objectType);
 
         /* Call the message notification function. */
-        $this->loadModel('message')->send(strtolower($objectType), $objectID, $actionType, $actionID, $actor);
+        $this->loadModel('message')->send(strtolower($objectType), $objectID, $actionType, $actionID, $actor, $extra);
 
         /* Add index for global search. */
         $this->saveIndex($objectType, $objectID, $actionType);

module/message/model.php

@@ -59,10 +59,12 @@ class messageModel extends model
      * @param  int    $objectID
      * @param  string $actionType
      * @param  int    $actionID
+     * @param  string $actor
+     * @param  string $extra
      * @access public
      * @return void
      */
-    public function send($objectType, $objectID, $actionType, $actionID, $actor = '')
+    public function send($objectType, $objectID, $actionType, $actionID, $actor = '', $extra = '')
     {
         $objectType     = strtolower($objectType);
         $messageSetting = $this->config->message->setting;