Merge remote-tracking branch 'origin/master'

src/main/java/com/zoniot/ccrc/entity/Device.java

@@ -56,6 +56,7 @@ public class Device {
     @ApiModelProperty(value="设备状态  1:正常 2:故障 3:无 4: 预警 5:未启用")
     private Integer deviceStatus;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value="最后上报时间")
     private Date lastReceiveTime;