From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngVillageListExportAdminDTO.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngVillageListExportAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngVillageListExportAdminDTO.java
index 1667e80..d42efbc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngVillageListExportAdminDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngVillageListExportAdminDTO.java
@@ -1,12 +1,13 @@
package com.panzhihua.common.model.dtos.grid.admin;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import java.util.List;
import javax.validation.constraints.Max;
import javax.validation.constraints.Pattern;
-import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* 小区列表导出-请求参数
@@ -15,7 +16,7 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Data
@ApiModel("小区列表-请求参数")
public class ComMngVillageListExportAdminDTO {
@@ -36,12 +37,13 @@
@ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
private Long userId;
- @ApiModelProperty(value = "排序字段, 默认 创建时间：createAt(在住居民数：userSum，楼栋数：buildSum，总户数：houseNum，户籍人口：registerNum)", example = "createAt")
- private String sortAttr="createAt";
+ @ApiModelProperty(value = "排序字段, 默认 创建时间：createAt(在住居民数：userSum，楼栋数：buildSum，总户数：houseNum，户籍人口：registerNum)",
+ example = "createAt")
+ private String sortAttr = "createAt";
@ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
@Pattern(regexp = "asc|desc|ASC|DESC")
- private String sortType="desc";
+ private String sortType = "desc";
@ApiModelProperty(value = "街路巷")
private String alley;
@@ -58,8 +60,8 @@
@ApiModelProperty(value = "小区id集合")
private List<Long> villageIds;
- public String getSortColumns(){
-// String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ public String getSortColumns() {
+ // String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
return sortAttr;
}
--
Gitblit v1.7.1