Merge branch 'develop-desk-tx' of...

Merge branch 'develop-desk-tx' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop-desk-tx

galaxy/galaxy/Res/Assets.xcassets/People/people_head_default.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Group 2033194042@2x.png",
+      "filename" : "APP默认头像-圆形2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group 2033194042@3x.png",
+      "filename" : "APP默认头像-圆形3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/TUICoreCustomTheme.bundle/enterprise/manifest.plist

@@ -21,7 +21,7 @@
 	<key>head_bg_gradient_end_color</key>
 	<string>#EBF0F6</string>
 	<key>default_group_head_public_img</key>
-	<string>default_group_head_public.png</string>
+	<string>default_c2c_head.png</string>
 	<key>default_group_head_meeting_img</key>
 	<string>default_group_head_meeting.png</string>
 	<key>default_group_head_avchatroom_img</key>
@@ -29,7 +29,7 @@
 	<key>default_group_head_community_img</key>
 	<string>default_group_head_community.png</string>
 	<key>default_group_head_img</key>
-	<string>default_group_head.png</string>
+	<string>default_c2c_head.png</string>
 	<key>default_c2c_head_img</key>
 	<string>default_c2c_head.png</string>
 	<key>search_textfield_bg_color</key>