fix

meas-system/src/main/java/com/meas/system/domain/MeasEnvData.java

@@ -71,8 +71,8 @@ public class MeasEnvData extends BaseEntity {
     /**
      * 时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
     private Date time;
 
     /**

meas-system/src/main/resources/mapper/meas/MeasBatchMapper.xml

@@ -19,7 +19,7 @@
         SELECT
             mb.id,
             mb.engine_id,
-            mem.model,
+            mem.engine_model,
             mb.measurement_batch,
             mb.create_by,
             mb.create_time,