Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_arison

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Feb 01 17:30:43 CST 2018
-debugName=325
+#Thu Feb 01 17:48:35 CST 2018
+debugName=326
 versionName=613
-debugCode=325
+debugCode=326
 versionCode=152

app_modular/appbooking/src/main/res/layout/item_dish_catagory_list.xml

@@ -6,7 +6,7 @@
     android:paddingLeft="10dp"
     android:paddingRight="10dp"
     android:paddingTop="8dp"
-    android:background="@drawable/selector_dish_menu"
+
     android:paddingBottom="8dp">
     <TextView
         android:id="@+id/tv_name"