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

# Conflicts:
#	WeiChat/version.properties

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/JoinCharitActivity.java

@@ -1,7 +1,6 @@
 package com.uas.appworks.OA.platform.activity;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -19,7 +18,6 @@ import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.net.utils.NetUtils;
-import com.core.utils.CommonUtil;
 import com.core.utils.IntentUtils;
 import com.core.utils.ToastUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
@@ -166,7 +164,7 @@ public class JoinCharitActivity extends BaseActivity {
                     status = JSONUtil.getText(projectOrActivity, "overdue", "stage");
                 }
 
-                int id = JSONUtil.getInt(o, "id");
+                int id = JSONUtil.getInt(projectOrActivity, "id");
                 int amount = JSONUtil.getInt(o, "amount");
                 LogUtil.i("amount=" + amount);
                 model.setId(id);