提交类型 下拉代码合并给苟安

提交内容 昨晚测试的一些代码和通用dbfind选择类的一些修改内容
冲突处理 版本文件，取网络

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Jan 10 19:17:36 CST 2018
-debugName=409
-versionName=624
-debugCode=409
-versionCode=163
+#Thu Jan 11 16:55:25 CST 2018
+debugName=411
+versionName=626
+debugCode=411
+versionCode=165

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

@@ -100,7 +100,7 @@ public class CommonUtil {
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
 //        if (BaseConfig.isDebug()){
-//            baseUrl="http://192.168.253.35:8080/ERP/";
+//            baseUrl="http://192.168.253.203:8090/ERP/";
 //        }
 //        baseUrl="http://192.168.253.203:8090/ERP/
 

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

@@ -125,8 +125,8 @@ public class SelectNetAcitivty extends OABaseActivity {
                 if (bundle != null) {
                     if (bundle.getInt(CodeUtils.RESULT_TYPE) == CodeUtils.RESULT_SUCCESS) {
                         String result = bundle.getString(CodeUtils.RESULT_STRING);
-                        LogUtil.i("result="+result);
-                        lastKey=result;
+                        LogUtil.i("result=" + result);
+                        lastKey = result;
                         showLoading();
                         loadSearch(page = 1, result);
                     }
@@ -198,13 +198,13 @@ public class SelectNetAcitivty extends OABaseActivity {
 //            String kwUp = keyWork.toUpperCase();
 //            StringBuilder conditionBulid = new StringBuilder();
 //            for (Map.Entry<String, String> e : configMap.entrySet()) {
-//                conditionBulid.append("upper(" +e.getValue()+ ") like '%" + kwUp+ "%' or ");
+//                conditionBulid.append("upper(" + e.getValue() + ") like '%" + kwUp + "%' or ");
 //            }
-//            if (conditionBulid.length()>2){
-//                conditionBulid.delete(conditionBulid.length()-3,conditionBulid.length());
+//            if (conditionBulid.length() > 2) {
+//                conditionBulid.delete(conditionBulid.length() - 3, conditionBulid.length());
 //            }
 //            condition = conditionBulid.toString();
-//            LogUtil.i("condition="+condition);
+//            LogUtil.i("condition=" + condition);
 //        }
         HttpClient.Builder builder = new HttpClient.Builder();
         boolean isForm = StringUtil.isEmpty(gCaller);

app_modular/apputils/src/main/java/com/modular/apputils/utils/SwitchUtil.java

@@ -9,7 +9,7 @@ import com.common.config.BaseConfig;
 
 public class SwitchUtil {
     public static boolean showYiyuanjuan() {
-        return true;
+        return false;
     }
 
     public static boolean showShebeiguanli() {