合并冲突

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/ResultBean.java

@@ -613,6 +613,7 @@ public class ResultBean<T> {
         public List<BizContent> renewalModelList;//带续期的车辆
 
         public List<BizContent> otherModelList;//其他车辆
+        public List<BizContent> cardObuInfos;
         public List<Companys> companys;//单位列表
         public EnumListEntity dictTypeAndItem; //枚举值列表
         public long passTotal; //通行合计