合并

mp-service/src/main/java/com/qs/mp/user/service/IUserTicketOrderService.java

@@ -7,12 +7,7 @@ import com.qs.mp.user.domain.UserTicketOrder;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qs.mp.user.domain.vo.TicketOrderSettleVO;
-<<<<<<< HEAD
-import com.qs.mp.user.domain.vo.UserDeliverOrderVO;
-
-=======
 import com.qs.mp.user.domain.vo.UserShareVO;
->>>>>>> branch 'dev' of http://113.31.163.91:7777/quanshu/mp-server
 import java.util.List;
 
 /**