Merge remote-tracking branch 'refs/remotes/origin/master'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

page_task/task_details/task_details.vue

@@ -42,12 +42,12 @@
           <graph @setNode="setNode"></graph>
         </view>
         <view v-else-if="current ===3">
-
+          <entities></entities>
         </view>
         <view v-else>
           <word></word>
         </view>
-      <entities></entities>
+
 
     </view>