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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Sat Oct 13 14:44:00 CST 2018
-debugName=900
-versionName=650
-debugCode=900
-versionCode=190
+#Sat Oct 13 17:08:49 CST 2018
+debugName=901
+versionName=651
+debugCode=901
+versionCode=191

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

@@ -11,12 +11,10 @@ import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.LinearLayout;
-import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -29,16 +27,13 @@ import com.common.file.FileUtils;
 import com.common.ui.CameraUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
 import com.core.base.OABaseActivity;
 import com.core.model.SelectBean;
-import com.core.utils.CommonUtil;
 import com.core.utils.StatusBarUtil;
 import com.core.utils.ToastUtil;
 import com.core.utils.time.wheel.DateTimePicker;
 import com.core.widget.view.Activity.ImgFileListActivity;
 import com.core.widget.view.Activity.SelectActivity;
-import com.core.widget.view.selectcalendar.bean.Data;
 import com.modular.apputils.R;
 import com.modular.apputils.adapter.BillAdapter;
 import com.modular.apputils.model.BillGroupModel;
@@ -48,14 +43,9 @@ import com.modular.apputils.presenter.imp.IBill;
 
 import java.io.File;
 import java.io.Serializable;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.HashMap;
-import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Set;
 
 
 /**
@@ -494,6 +484,7 @@ public class BillInputActivity extends OABaseActivity implements IBill, BillAdap
     }
 
     protected void handlerSelectDbFind(JSONObject object, int groupId) {
+        LogUtil.d("Arison","groupId:"+groupId+" object:"+object.toJSONString());
         BillGroupModel mBillGroupModel = mBillAdapter.getBillGroupModel(groupId);
         if (mBillGroupModel != null) {
             if (!ListUtils.isEmpty(mBillGroupModel.getShowBillFields())) {