Merge remote-tracking branch 'origin/developer' into developer

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerListActivity.java

@@ -324,12 +324,11 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
                 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                     switch (position) {
                         case 0:
-                            em_code = CommonUtil.getSharedPreferences(ct, "erp_username");
                             isSelected = 0;
                             page = 1;
                             kind = 0;
                             tv_name.setText(MyApplication.getInstance().mLoginUser.getNickName());
-                            sendHttpResquest(Constants.HTTP_SUCCESS_INIT, kind, page, isSelected, "");
+                            initData();
                             popupWindow.dismiss();
                             break;
                         case 1: