Merge remote-tracking branch 'origin/master'

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/api/ass/DeviceRenewalController.java

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.io.IOException;
 
 /**
  * @Auther: humh

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/ass/DeviceRenewalManagerImpl.java

@@ -22,7 +22,6 @@ import cn.com.taiji.core.model.comm.protocol.inss.renewalInst.RenewalInstCallBac
 import cn.com.taiji.core.model.comm.protocol.inss.renewalInst.RenewalInstCallBackResponse;
 import cn.com.taiji.core.repo.jpa.ass.AssDeviceRenewalRepo;
 import cn.com.taiji.core.repo.jpa.ass.AssOrderinfoRepo;
-import cn.com.taiji.core.repo.jpa.ass.AssRenewalCosRecordRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkCardInfoRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkCustomerInfoRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkObuInfoRepo;