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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/OAListAdapter.java

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/FormListSelectActivity.java

@@ -476,6 +476,9 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                 lists.remove(currentPosition-1);
                 rMap.put("listdata", lists);
                 adapter.notifyDataSetChanged();
+                if (adapter.getCount()==0){
+                    mEmptyLayout.showEmpty();
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();