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

# Conflicts:
#	app_modular/appworks/src/main/java/com/uas/appworks/activity/businessManage/businessDetailActivity/BusinessDetailNewActivity.java
#	app_modular/appworks/src/main/java/com/uas/appworks/adapter/BusinessStageAdapter.java

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Dec 12 15:47:16 CST 2018
-debugName=974
+#Fri Dec 14 14:44:03 CST 2018
+debugName=976
 versionName=649
-debugCode=974
+debugCode=976
 versionCode=204

app_modular/apputils/src/main/java/com/modular/apputils/fragment/BIllListFragment.java

@@ -191,7 +191,7 @@ public class BIllListFragment extends ViewPagerLazyFragment {
                     if (!TextUtils.isEmpty(dataIndex) && i == 0) {
                         fieldConfig.add(dataIndex);
                     }
-                    if ("状态".equals(caption)){
+                    if ("状态".equals(caption)||"单据状态".equals(caption)){
                         status= values;
                     }
                     BillListGroupModel.BillListField billListField = new BillListGroupModel.BillListField();

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/CustomerVisitActivity.java

@@ -236,7 +236,7 @@ public class CustomerVisitActivity extends BaseActivity {
                 long entryDate = JSONUtil.getTime(object, "entry_date");
                 long startTime = JSONUtil.getTime(object, "start_time");
                 long endTime = JSONUtil.getTime(object, "end_time");
-                String status = JSONUtil.getText(object, "status");
+                String status = JSONUtil.getText(object, "mpd_zdstatus","status");
                 String doman = JSONUtil.getText(object, "doman");
                 String domanCode = JSONUtil.getText(object, "domanCode");
                 mVisitPlan.setId(id);