Merge branches 'developer' and 'feature_raomeng' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_raomeng

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Jan 03 10:39:42 CST 2019
+#Thu Jan 03 17:42:18 CST 2019
 debugName=971
-versionName=662
+versionName=666
 debugCode=971
-versionCode=217
+versionCode=221

app_modular/apputils/src/main/java/com/modular/apputils/activity/BillInputActivity.java

@@ -250,7 +250,7 @@ public class BillInputActivity extends OABaseActivity implements IBill, BillAdap
         param.put("page", "1");
         param.put("which", "form");
         param.put("condition", "1=1");
-        param.put("pageSize", "30");
+        param.put("pageSize", "1000");
         param.put("field", model.getField());
         Bundle bundle = new Bundle();
         bundle.putSerializable("param", param);

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

@@ -246,9 +246,12 @@ public class CustomerManageActivity extends OABaseActivity implements ICustomerM
         map.put("item_name", "客户联系人");
         list.add(map);
 
-        /*map = new HashMap<>();
-        map.put("item_name", "拜访报告");
-        list.add(map);*/
+        String master = CommonUtil.getMaster();
+        if (!("DATACENTER".equals(master) || "N_SHYZ".equals(master) || "N_AJC".equals(master))) {
+            map = new HashMap<>();
+            map.put("item_name", "拜访报告");
+            list.add(map);
+        }
 
 //        map = new HashMap<>();
 //        map.put("item_name", "正式客户");