# Conflicts:
#	android/app/src/main/java/com/bolanmanagerapp/MainApplication.java
#	src/utils/config.js

# Conflicts:
#	android/app/src/main/java/com/bolanmanagerapp/MainApplication.java
#	src/utils/config.js

# Conflicts:
#	android/app/src/main/java/com/bolanmanagerapp/MainApplication.java
#	src/utils/config.js

# Conflicts:
#	android/app/src/main/java/com/bolanmanagerapp/MainApplication.java
#	src/utils/config.js

# Conflicts:
#	android/app/src/main/java/com/bolanmanagerapp/MainApplication.java
#	src/utils/config.js

# Conflicts:
#	android/app/src/main/java/com/bolanmanagerapp/MainApplication.java
#	src/utils/config.js

improve：完善文档

2、已经存储过该人口的身份证相关信息做一个提示框，人口信息已存在
3、人口信息界面编辑按钮去除。
4、所有的界面一行如果数据超过一定字符，显示不全，建议全部信息显示完全（做自动换行，或有下拉选项再显示完全字段信息）便于核实和查验信息。

# Conflicts:
#	package.json