Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_raomeng

# Conflicts:
#	WeiChat/src/main/res/layout/activity_expense_reimbursement.xml
#	app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/MeetDetailsActivity.java

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

@@ -38,7 +38,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="1dp"
-                    android:layout_marginTop="19dp"
+                    android:layout_marginTop="10dp"
                     android:layout_toRightOf="@id/name_tv"
                     android:text="*"
                     android:textColor="@color/red" />
@@ -94,7 +94,6 @@
 
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/reimbursement_type_fet"
-                    xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"

app_core/common/src/main/java/com/core/app/Constants.java

@@ -20,8 +20,8 @@ public class Constants {
     public static final String IM_BASE_URL_TEST = "http://113.105.74.135:8092/";
     //询价服务正式地址
 //    public static final String API_INQUIRY = "https://api-inquiry.usoftmall.com/";
-//    public static final String API_INQUIRY = "http://218.17.158.219:24000/";
-    public static final String API_INQUIRY = "http://10.1.51.82:24002/";
+    public static final String API_INQUIRY = "http://218.17.158.219:24000/";
+//    public static final String API_INQUIRY = "http://10.1.51.82:24002/";
 
     public static String IM_BASE_URL() {
         String url = "";

settings.gradle

@@ -20,8 +20,6 @@ include ':apputils'
 include  ':appmusic'
 include  ':facesdk'
 include  ':applocation'
-//include  ':faceplatform-ui'
-//include  ':faceplatform-release'
 //第三库模块
 
 include ':lib-zxing'
@@ -56,7 +54,6 @@ project(':apputils').projectDir = new File('app_modular/apputils')
 project(':appmusic').projectDir = new File('app_modular/appmusic')
 project(':facesdk').projectDir = new File('app_modular/facesdk')
 project(':applocation').projectDir = new File('app_modular/applocation')
-//project(':faceplatform-release').projectDir = new File('app_modular/faceplatform-release')
 //第三库模块
 
 project(':lib-zxing').projectDir = new File('app_third/lib-zxing')