From dfea866e55c725bd601ff84c92dff30f83057571 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 30 三月 2023 19:56:59 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/vo/cockpit/CockpitVO.java | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/vo/cockpit/CockpitVO.java b/ycl-common/src/main/java/com/ycl/vo/cockpit/CockpitVO.java
index 766923c..f8d525d 100644
--- a/ycl-common/src/main/java/com/ycl/vo/cockpit/CockpitVO.java
+++ b/ycl-common/src/main/java/com/ycl/vo/cockpit/CockpitVO.java
@@ -15,7 +15,7 @@
@Data
@ApiModel
public class CockpitVO {
-// @Data
+ // @Data
// @ApiModel
// public class Params1VO implements Serializable {
// @ApiModelProperty(value = "appId", example = "1")
@@ -32,23 +32,30 @@
// @Data
// @ApiModel
// public class Params2VO implements Serializable {
- @ApiModelProperty(value = "appId", example = "1")
- @NotBlank(message = "appId涓嶈兘涓虹┖")
- private String appId;
- @ApiModelProperty(value = "appKey", example = "1")
- @NotBlank(message = "appKey涓嶈兘涓虹┖")
- private String appKey;
- @ApiModelProperty(value = "sign", example = "sfagjgfjgfjdgfjsgdfgsa")
- @NotBlank(message = "sign涓嶈兘涓虹┖")
- private String sign;
+ @ApiModelProperty(value = "appId", example = "1")
+ @NotBlank(message = "appId涓嶈兘涓虹┖")
+ private String appId;
+ @ApiModelProperty(value = "appKey", example = "1")
+ @NotBlank(message = "appKey涓嶈兘涓虹┖")
+ private String appKey;
+ @ApiModelProperty(value = "sign", example = "sfagjgfjgfjdgfjsgdfgsa")
+ @NotBlank(message = "sign涓嶈兘涓虹┖")
+ private String sign;
- @ApiModelProperty(value = "streetId", example = "25")
- private Integer streetId;
- @ApiModelProperty(value = "寮�濮嬫椂闂达紝鏍煎紡yyyy-MM-dd hh:mm:ss", example = "2022-10-22 13:22:22")
+ @ApiModelProperty(value = "streetId", example = "25")
+ private Integer streetId;
+ @ApiModelProperty(value = "寮�濮嬫椂闂达紝鏍煎紡yyyy-MM-dd hh:mm:ss", example = "2022-10-22 13:22:22")
// @NotBlank(message = "寮�濮嬫椂闂翠笉鑳戒负绌�")
- private String beginTime;
- @ApiModelProperty(value = "缁撴潫鏃堕棿锛屾牸寮弝yyy-MM-dd hh:mm:ss", example = "2022-10-23 13:22:22")
+ private String beginTime;
+ @ApiModelProperty(value = "缁撴潫鏃堕棿锛屾牸寮弝yyy-MM-dd hh:mm:ss", example = "2022-10-23 13:22:22")
// @NotBlank(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖")
- private String endTime;
+ private String endTime;
+
+ @ApiModelProperty(value = "pageIndex", example = "25")
+ private Integer pageIndex;
+
+
+ @ApiModelProperty(value = "pageSize", example = "25")
+ private Integer pageSize;
// }
}
--
Gitblit v1.8.0