冲突之后的提交 8-22

WeiChat/src/main/res/layout/activity_business_qiang_activty.xml

@@ -34,6 +34,7 @@
             android:textColor="@color/dark_grey"
             android:textColorHint="@color/grey"
             android:textSize="15sp" />
+        
     </RelativeLayout>
     <LinearLayout
         android:id="@+id/ll_top_state"