<merge code from dev_dingxu>

Signed-off-by: alan <547533434@qq.com>

test/fixtures/activities.yml

@@ -1,7 +1,7 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
 
 one:
-<<<<<<< HEAD
+
   act_id: 
   act_type: MyString
   user_id: 
@@ -10,7 +10,7 @@ two:
   act_id: 
   act_type: MyString
   user_id: 
-=======
+
   id: 1
   act_id: 1
   act_type: JournalsForMessage
@@ -20,4 +20,4 @@ two:
   act_id: 2
   act_type: JournalsForMessage
   user_id: 5
->>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0
+