环保巡检点配置导入

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -31,8 +31,8 @@ public interface LauncherConstant {
     /**
      * nacos dev 地址
      */
-    String NACOS_DEV_ADDR = "192.168.249.27:8848";
+    //String NACOS_DEV_ADDR = "192.168.249.27:8848";
-//    String NACOS_DEV_ADDR = "127.0.0.1:8848";
+    String NACOS_DEV_ADDR = "127.0.0.1:8848";
 
     /**R
      * nacos prod 地址

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuInspectionPointExcel.java

@@ -71,18 +71,8 @@ public class BsEpciuInspectionPointExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("巡检点位置")
 	private String insSite;
-	/**
+
-	 * 上次巡检日期
+
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("上次检验日期")
-	private Date lastInsCycle;
-	/**
-	 * 备注
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("备注")
-	private String memo;
 	/**
 	 * 是否已删除
 	 */
@@ -99,7 +89,21 @@ public class BsEpciuInspectionPointExcel implements Serializable {
 	 * 巡检周期
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("巡检周期")
+	@ExcelProperty("巡检周期(h)")
 	private Long insCycle;
 
+	/**
+	 * 上次巡检日期
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("上次检验日期")
+	private Date lastInsCycle;
+
+	/**
+	 * 备注
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("备注")
+	private String memo;
+
 }