合并代码

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('C:/Users/Arsiono/Desktop/applicationsignname[20150409]')
+            storeFile file('D:/config/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/attendance/AutoErpSigninUitl.java

@@ -108,9 +108,9 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
         if (model.getStatus() == 2) remark = "自动外勤签退";
         else remark = "自动外勤签到";
         formStore.put("mo_remark", remark);//备注
-        String location = MyApplication.getInstance().getBdLocationHelper().getName();
+        String location = model.getCompanyName();
         if (StringUtils.isEmpty(location))
-            location = model.getCompanyName();
+            location = MyApplication.getInstance().getBdLocationHelper().getName();
         formStore.put("mo_company", location);
 //        param.put("mpd_status", "签退");//
         param.put("caller", "Mobile_outsign");