改了测试类

src/test/java/com/ctrip/fun/golf/dao/statistics/user/UserOrderBehaviourStatisticsDaoTest.java

@@ -20,7 +20,6 @@ import com.ctrip.fun.common.vo.advert.AdvertiserQuery;
 import com.ctrip.fun.common.vo.market.EventGameBean;
 import com.ctrip.fun.common.vo.market.EventGameGroupBean;
 import com.ctrip.fun.common.vo.market.EventGamePlayerBean;
-<<<<<<< HEAD
 import com.ctrip.fun.common.vo.order.BuyVoucherActivityBean;
 import com.ctrip.fun.common.vo.order.EventCustomerInfoBean;
 import com.ctrip.fun.common.vo.order.EventCustomerInfoQuery;
@@ -43,8 +42,6 @@ import com.ctrip.fun.golf.service.market.EventGameService;
 import com.ctrip.fun.golf.service.order.CommuneOrderService;
 import com.ctrip.fun.golf.service.order.EventCustomerInfoService;
 import com.ctrip.fun.golf.service.payment.EventActivityNotifyService;
-=======
-import com.ctrip.fun.common.vo.order.OrderStatusBitEnum;
 import com.ctrip.fun.golf.dao.adminUser.AdminResourcesDao;
 import com.ctrip.fun.golf.dao.adminUser.AdminRoleDao;
 import com.ctrip.fun.golf.dao.adminUser.AdminUserDao;
@@ -57,13 +54,6 @@ import com.ctrip.fun.golf.service.adminUser.AdminUserService;
 import com.ctrip.fun.golf.service.market.EventGameGroupService;
 import com.ctrip.fun.golf.service.market.EventGamePlayerService;
 import com.ctrip.fun.golf.service.market.EventGameService;
-
-
-
-
-
-
->>>>>>> roleRebuild
 import com.ctrip.fun.golf.vo.PagedEntityBean;
 
 import org.junit.Test;