优化文字描述，去掉小塾导入imei号校验

src/main/java/com/ssj/sys/controller/FxController.java

@@ -1714,10 +1714,11 @@ public class FxController  extends BaseController {
     		myColumns3.add(new ExcelColumn("现状态", "status", 20));
     		
     		myColumns3.add(new ExcelColumn("设备名称", "deviceName", 20));
-    		myColumns3.add(new ExcelColumn("小塾号", "deviceNumber", 20));
+			myColumns3.add(new ExcelColumn("真实小塾编号", "deviceRealNumber", 20));
+    		myColumns3.add(new ExcelColumn("小塾编号", "deviceNumber", 20));
     		myColumns3.add(new ExcelColumn("设备颜色", "deviceColor", 20));
-    		myColumns3.add(new ExcelColumn("设备型号", "deviceModel", 20));
-    		myColumns3.add(new ExcelColumn("设备代码", "deviceCode", 20));
+    		myColumns3.add(new ExcelColumn("ICCID编号", "deviceModel", 20));
+    		myColumns3.add(new ExcelColumn("SIM卡号", "deviceCode", 20));
     		myColumns3.add(new ExcelColumn("simcard", "deviceSn", 20));
     		
     	//	myColumns3.add(new ExcelColumn("是否跨区", "isSpan", 20));
@@ -1782,10 +1783,11 @@ public class FxController  extends BaseController {
 	    		myColumns3.add(new ExcelColumn("现状态", "status", 20));
 	    		
 	    		myColumns3.add(new ExcelColumn("设备名称", "deviceName", 20));
-	    		myColumns3.add(new ExcelColumn("小塾号", "deviceNumber", 20));
+	    		myColumns3.add(new ExcelColumn("真实小塾编号", "deviceRealNumber", 20));
+	    		myColumns3.add(new ExcelColumn("小塾编号", "deviceNumber", 20));
 	    		myColumns3.add(new ExcelColumn("设备颜色", "deviceColor", 20));
-	    		myColumns3.add(new ExcelColumn("设备型号", "deviceModel", 20));
-	    		myColumns3.add(new ExcelColumn("设备代码", "deviceCode", 20));
+	    		myColumns3.add(new ExcelColumn("ICCID编号", "deviceModel", 20));
+	    		myColumns3.add(new ExcelColumn("SIM卡号", "deviceCode", 20));
 	    		myColumns3.add(new ExcelColumn("simcard", "deviceSn", 20));
 	    		
 	    	//	myColumns3.add(new ExcelColumn("是否跨区", "isSpan", 20));

src/main/java/com/ssj/sys/utils/ExcelUtils.java

@@ -38,9 +38,10 @@ public class ExcelUtils {
   			if (row == null) {
   				break;
   			}
-  			if(StringUtils.isEmpty(gettxt(row.getCell(0)))){
-  				continue;
-  			}
+  			//以前工厂发货会用imei 现在没有了
+//  			if(StringUtils.isEmpty(gettxt(row.getCell(0)))){
+//  				continue;
+//  			}
   			
   			Device device=new Device();
   			device.setCreateTime(new Date());

src/main/resources/templates/sys/fx/deviceAllList.html

@@ -36,22 +36,22 @@
 			</li>
 			
 			<li>
-				<label>真实小塾号</label>
-				<input type="text" id="imei1" name="LIKE_deviceRealNumber" th:value="${search.get('LIKE_deviceRealNumber')}" class="scinput date_width " placeholder="真实小塾号">
+				<label>实际小塾编号</label>
+				<input type="text" id="imei1" name="LIKE_deviceRealNumber" th:value="${search.get('LIKE_deviceRealNumber')}" class="scinput date_width " placeholder="实际小塾编号">
 			</li>
 			<li>
-				<label>小塾号</label>
-				<input type="text" id="imei1" name="LIKE_deviceNumber" th:value="${search.get('LIKE_deviceNumber')}" class="scinput date_width " placeholder="小塾号">
+				<label>小塾编号</label>
+				<input type="text" id="imei1" name="LIKE_deviceNumber" th:value="${search.get('LIKE_deviceNumber')}" class="scinput date_width " placeholder="小塾编号">
 			</li>
 			
 			<li>
-				<label>设备型号</label>
-				<input type="text" id="imei1" name="LIKE_deviceModel" th:value="${search.get('LIKE_deviceModel')}" class="scinput date_width " placeholder="设备型号">
+				<label>ICCID编号</label>
+				<input type="text" id="imei1" name="LIKE_deviceModel" th:value="${search.get('LIKE_deviceModel')}" class="scinput date_width " placeholder="ICCID编号">
 			</li>
 			
 			<li>
-				<label>设备代码</label>
-				<input type="text" id="imei1" name="LIKE_deviceCode" th:value="${search.get('LIKE_deviceCode')}" class="scinput date_width " placeholder="设备代码">
+				<label>SIM卡号</label>
+				<input type="text" id="imei1" name="LIKE_deviceCode" th:value="${search.get('LIKE_deviceCode')}" class="scinput date_width " placeholder="SIM卡号">
 			</li>
 				
 			<li>
@@ -164,15 +164,15 @@
 		    <tr>
 				<th style="width: 50px;"><input id="basecheckbox"  type="checkbox"></th>
 				<th>imei号</th>
-				<th>真实小塾号</th>
-				<th>小塾号</th>
-				<th>设备型号</th>
-				<th>设备代码</th>
+				<th>实际小塾编号</th>
+				<th>小塾编号</th>
+				<th>ICCID编号</th>
+				<th>SIM卡号</th>
 		        <th>现商户</th>
 		        <th>现商户名称</th>
 		        <th>现状态</th>
 		    	<th>设备名称</th>
-<!--  		    	<th>小塾号</th> -->
+<!--  		    	<th>小塾编号</th> -->
 		        <th>设备颜色</th>
 <!-- 		        <th>设备SN</th> -->
 		     <!--   <th>是否跨区</th>-->

src/main/resources/templates/sys/fx/deviceList.html

@@ -37,23 +37,23 @@
 				<input type="text" id="imei1" name="LIKE_imei" th:value="${search.get('LIKE_imei')}" class="scinput date_width " placeholder="IMEI号">
 			</li>
 		  <li>
-			  <label>真实小塾号</label>
-			  <input type="text" id="imei1" name="LIKE_deviceRealNumber" th:value="${search.get('LIKE_deviceRealNumber')}" class="scinput date_width " placeholder="小塾号">
+			  <label>实际小塾编号</label>
+			  <input type="text" id="imei1" name="LIKE_deviceRealNumber" th:value="${search.get('LIKE_deviceRealNumber')}" class="scinput date_width " placeholder="实际小塾编号">
 		  </li>
 
 			<li>
-				<label>小塾号</label>
-				<input type="text" id="imei1" name="LIKE_deviceNumber" th:value="${search.get('LIKE_deviceNumber')}" class="scinput date_width " placeholder="小塾号">
+				<label>小塾编号</label>
+				<input type="text" id="imei1" name="LIKE_deviceNumber" th:value="${search.get('LIKE_deviceNumber')}" class="scinput date_width " placeholder="小塾编号">
 			</li>
 			
 			<li>
-				<label>设备型号</label>
-				<input type="text" id="imei1" name="LIKE_deviceModel" th:value="${search.get('LIKE_deviceModel')}" class="scinput date_width " placeholder="设备型号">
+				<label>ICCID编号</label>
+				<input type="text" id="imei1" name="LIKE_deviceModel" th:value="${search.get('LIKE_deviceModel')}" class="scinput date_width " placeholder="ICCID编号">
 			</li>
 			
 			<li>
-				<label>设备代码</label>
-				<input type="text" id="imei1" name="LIKE_deviceCode" th:value="${search.get('LIKE_deviceCode')}" class="scinput date_width " placeholder="设备代码">
+				<label>SIM卡号</label>
+				<input type="text" id="imei1" name="LIKE_deviceCode" th:value="${search.get('LIKE_deviceCode')}" class="scinput date_width " placeholder="SIM卡号">
 			</li>
 				
 			<li>
@@ -167,18 +167,18 @@
 		    <tr>
 				<th style="width: 50px;"><input id="basecheckbox"  type="checkbox"></th>
 				<th>imei号</th>
-				<th>真实小塾号</th>
-				<th>小塾号</th>
-				<th>设备型号</th>
-				<th>设备代码</th>
+				<th>实际小塾编号</th>
+				<th>小塾编号</th>
+				<th>ICCID编号</th>
+				<th>SIM卡号</th>
 		        <th>现商户</th>
 		        <th>现商户名称</th>
 		        <th>现状态</th>
 		    	<th>设备名称</th>
 <!--  		    	<th>设备编号</th> -->
-<!-- 		    	<th>设备型号</th> -->
+<!-- 		    	<th>ICCID编号</th> -->
 		        <th>设备颜色</th>
-<!-- 		        <th>设备代码</th> -->
+<!-- 		        <th>SIM卡号</th> -->
 <!-- 		        <th>设备SN</th> -->
 <!--		        <th>是否跨区</th>-->
 		        <th>批次编号</th>