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

# Conflicts:
#	WeiChat/src/main/res/values-en/strings.xml

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/DataFormDetailActivity.java

@@ -484,7 +484,11 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         LogUtil.d("result:" + result);
                         LogUtil.d(formidkey);
                         success = JSON.parseObject(result).getBoolean("success");
-                        va_id = JSON.parseObject(result).getIntValue(formidkey);
+                        if ("ExtraWork$".equals(caller)){
+                            va_id = JSON.parseObject(result).getIntValue("wod_id");
+                        }else{
+                            va_id = JSON.parseObject(result).getIntValue(formidkey);
+                        }
                         if (success) {
 
                             judgeApprovers(va_id);