Merge branch 'pailei2_sunhuawei_50714' into 'pailei2'

Pailei2 sunhuawei 50714

See merge request easycorp/zentaopms!2231

module/task/config.php

@@ -35,7 +35,7 @@ $config->task->exportFields = '
     openedBy, openedDate, assignedTo, assignedDate,
     finishedBy, finishedDate, canceledBy, canceledDate,
     closedBy, closedDate, closedReason,
-    lastEditedBy, lastEditedDate,files
+    lastEditedBy, lastEditedDate, avtivatedDate, files
     ';
 
 $config->task->customCreateFields      = 'story,estStarted,deadline,mailto,pri,estimate';

module/task/model.php

@@ -3286,6 +3286,9 @@ class taskModel extends model
             case 'lastEditedDate':
                 echo substr($task->lastEditedDate, 5, 11);
                 break;
+            case 'activatedDate':
+                echo helper::isZeroDate($bug->activatedDate) ? '' : substr($task->activatedDate, 5, 11);
+                break;
             case 'actions':
                 if($storyChanged)
                 {