修改日期格式

signal-utc-service/src/main/java/net/wanji/utc/controller/ManufacturerController.java

@@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 系统管理-厂商管理
  *
@@ -41,9 +43,15 @@ public class ManufacturerController {
             @ApiResponse(code = 200, message = "OK", response = ManufacturerInfoPO.class),
     })
     public JsonViewObject list(@RequestBody ManufacturerListDTO manufacturerListDTO) {
+        Integer pageSize = manufacturerListDTO.getPageSize();
+        Integer pageNum = manufacturerListDTO.getPageNum();
+        if (pageSize == 0 && pageNum == 0) {
+            // 不分页
+            manufacturerListDTO.setPageNum(1);
+            manufacturerListDTO.setPageSize(9999);
+        }
         PageInfo<ManufacturerInfoPO> manufacturerInfoPOPageInfo = manufacturerService.list(manufacturerListDTO);
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
-
         return jsonViewObject.success(manufacturerInfoPOPageInfo);
     }
 

signal-utc-service/src/main/java/net/wanji/utc/vo/systemadmin/CrossInfoListVO.java

 package net.wanji.utc.vo.systemadmin;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -41,6 +42,7 @@ public class CrossInfoListVO {
     private String model ;
     /** 安装时间 */
     @ApiModelProperty(value = "安装时间",notes = "")
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
     private Date installTime ;
     /** 创建时间 */
     @ApiModelProperty(value = "创建时间",notes = "")