1、设备录入操作人显示

src/main/java/cn/fastfun/controller/api/IndexController.java

@@ -131,32 +131,32 @@ public class IndexController {
         res.put("deliverTime", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getDeliverTime()), DateUtils.YMDHMS));
         List<Map<String,String>> timeStream = new ArrayList<>();
         Map<String , String > map = new HashMap<>();
-        map.put("addTime", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getAddTime()), DateUtils.YMDHMS));
+        map.put("time", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getAddTime()), DateUtils.YMDHMS));
         map.put("label", "录入时间");
         timeStream.add(map);
 
         map = new HashMap<>();
-        map.put("instorageTime", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getInstorageTime()), DateUtils.YMDHMS));
+        map.put("time", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getInstorageTime()), DateUtils.YMDHMS));
         timeStream.add(map);
         map.put("label", "入库时间");
 
         map = new HashMap<>();
-        map.put("transferTime", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getTransferTime()), DateUtils.YMDHMS));
+        map.put("time", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getTransferTime()), DateUtils.YMDHMS));
         timeStream.add(map);
         map.put("label", "调拨时间");
 
         map = new HashMap<>();
-        map.put("transferBackTime", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getTransferBackTime()), DateUtils.YMDHMS));
+        map.put("time", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getTransferBackTime()), DateUtils.YMDHMS));
         timeStream.add(map);
         map.put("label", "回调时间");
 
         map = new HashMap<>();
-        map.put("outstorageTime", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getOutstorageTime()), DateUtils.YMDHMS));
+        map.put("time", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getOutstorageTime()), DateUtils.YMDHMS));
         timeStream.add(map);
         map.put("label", "出库时间");
 
         map = new HashMap<>();
-        map.put("handleTime", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getHandleTime()), DateUtils.YMDHMS));
+        map.put("time", DateUtils.toString(ObjectUtil.obj2Date(devicePage.getHandleTime()), DateUtils.YMDHMS));
         timeStream.add(map);
 
         res.put("timeStream", timeStream);

src/main/resources/application-dev.yml

@@ -13,6 +13,7 @@ spring:
 #      driverClassName: com.mysql.cj.jdbc.Driver
   redis:
     host: 47.111.243.220
+
     port: 9379
   jpa:
     database: mysql