提交分类： 修改ip；

提交内容：
          修改ip；

当前版本：  测试版本6.1.1

是否冲突： 否

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Dec 21 13:34:25 CST 2017
-debugName=220
+#Thu Dec 21 17:03:56 CST 2017
+debugName=221
 versionName=612
-debugCode=220
+debugCode=221
 versionCode=151

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -99,7 +99,7 @@ public class CommonUtil {
             return "";
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
-        baseUrl="http://192.168.253.203:8090/ERP/";
+//        baseUrl="http://192.168.253.203:8090/ERP/";
         return baseUrl;
     }
 

app_modular/appworks/src/main/java/com/uas/appworks/activity/DeviceQueryActivity.java

@@ -75,7 +75,7 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
     private Animation mInAnimation, mOutAnimation;
 
     private String fuzzyHint = "", mCondition = "1 = 1", mBaseCondition = "";
-    private int mPageIndex = 1, mPagesize = 25;
+    private int mPageIndex = 1, mPageSize = 25;
     private List<DataInquiryFlexBean> mDeviceQueryFlexBeans;
     private DataInquiryFlexAdapter mDeviceQueryFlexAdapter;
     private List<DataInquiryFlexBean.RowBean.RowChildBean> mAllRowChildBeans;
@@ -300,7 +300,7 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
         params.put("caller", mCaller);
         params.put("condition", mCondition);
         params.put("page", mPageIndex);
-        params.put("pageSize", mPagesize);
+        params.put("pageSize", mPageSize);
 
         LinkedHashMap<String, Object> header = new LinkedHashMap<>();
         header.put("Cookie", CommonUtil.getErpCookie(mContext));

app_modular/appworks/src/main/java/com/uas/appworks/datainquiry/activity/DataInquiryListActivity.java

@@ -87,7 +87,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
     private View mGrayBackGround;
     private RelativeLayout mTotalHideRl;
     private Animation mInAnimation, mOutAnimation;
-    private int mPageIndex = 1, mPagesize = 10;
+    private int mPageIndex = 1, mPageSize = 10;
     private List<HistoricalRecordBean> mHistoricalRecordBeans;
     private HistoricalRecordAdapter mHistoricalRecordAdapter;
     private String mSearchField = "";
@@ -443,7 +443,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                 JSONArray listArray = resultObject.optJSONArray("listdata");
                 JSONObject totalObject = resultObject.optJSONObject("summaryField");
 
-                if ((listArray == null || listArray.length() < mPagesize) && mPageIndex > 1) {
+                if ((listArray == null || listArray.length() < mPageSize) && mPageIndex > 1) {
                     ToastMessage("已加载全部数据");
                 }
                 if (totalObject != null) {
@@ -1034,7 +1034,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         params.put("caller", mCaller);
         params.put("id", mSchemeId);
         params.put("pageIndex", mPageIndex);
-        params.put("pageSize", mPagesize);
+        params.put("pageSize", mPageSize);
         params.put("condition", mCondition);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));