# Conflicts:
#	app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/Api.java
#	app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/IFCode.java
#	app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/ResultBean.java
#	app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/MainActivity.java
#	app/src/main/java/com/huntersun/vkyes/etcopencard/project/utils/SearchCarInfoUtils.java

2.卡续期、签续期接口更改