浏览代码

fix 解决冲突

zoujiajian 3 年之前
父节点
当前提交
0d4e232ee0

+ 4 - 2
netflix-web/src/main/java/com/cyksj/web/controller/manage/register/CmsRegisterController.java

@@ -1,9 +1,9 @@
 package com.cyksj.web.controller.manage.register;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import cn.hutool.core.util.StrUtil;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.util.IoKit;
 import com.cyksj.common.util.Xmls;
@@ -14,10 +14,10 @@ import com.cyksj.model.entity.AppleAutoRegisterData;
 import com.cyksj.model.entity.RegisterOrderDon;
 import com.cyksj.model.excel.ExcelAppleIdTemplateData;
 import com.cyksj.model.excel.listener.ExcelAppleDataListener;
+import com.cyksj.model.request.WxOrderRefundReq;
 import com.cyksj.model.views.AppleIdCountryOrAreaDataView;
 import com.cyksj.model.views.AppleIdHeadDataView;
 import com.cyksj.model.views.AppleIdRegisterView;
-import com.cyksj.model.request.WxOrderRefundReq;
 import com.cyksj.service.register.RegisterOrderDonService;
 import com.cyksj.web.util.EasyExcelUtils;
 import com.ejlchina.searcher.BeanSearcher;
@@ -33,6 +33,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
+import java.util.Map;
 
 /**
  * @author chan