diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index bc322eab..8651ee38 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/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 = "127.0.0.1:8848"; + //String NACOS_DEV_ADDR = "192.168.249.27:8848"; + String NACOS_DEV_ADDR = "127.0.0.1:8848"; /**R * nacos prod 地址 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuInspectionPointExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuInspectionPointExcel.java index 8edac720..1c712040 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuInspectionPointExcel.java +++ b/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; + } diff --git a/blade-service/blade-desk/src/main/resources/Excel/QA/环保巡检点配置导入模板.xls b/blade-service/blade-desk/src/main/resources/Excel/QA/环保巡检点配置导入模板.xls index 40e383b6..8eeef4f7 100644 Binary files a/blade-service/blade-desk/src/main/resources/Excel/QA/环保巡检点配置导入模板.xls and b/blade-service/blade-desk/src/main/resources/Excel/QA/环保巡检点配置导入模板.xls differ