Merge remote-tracking branch 'origin/master'

business-service/src/main/java/com/ozs/entity/VehiclePosition.java

@@ -71,7 +71,7 @@ public class VehiclePosition implements Serializable {
     /**
      *创建时间
      */
-    @Excel(name = "解除时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;