代码冲突

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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java
#	app_core/common/src/main/java/com/common/data/StringUtil.java

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/message/PersonalRegActivity.java

@@ -19,15 +19,15 @@ import com.common.data.CalendarUtil;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
 import com.common.hmac.Md5Util;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.R;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.utils.time.wheel.DateTimePicker;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.GregorianCalendar;
 import java.util.HashMap;
@@ -157,7 +157,7 @@ public class PersonalRegActivity extends BaseActivity implements View.OnClickLis
 
     private void doRegiter() {
         progressDialog.dismiss();
-        String url = "http://113.105.74.140:8092/" + "user/appRegister";
+        String url = Constants.IM_BASE_URL() + "user/appRegister";
         Map<String, Object> params = new HashMap<>();
         params.put("telephone", phone_et.getText().toString());
         params.put("password", md5_password);