Merge branch 'test' into 'master'

罗元桥

2021-07-02 b011bd6481707b75ae1aecddba029115fa9a6a43

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComMngVillageListAppDTO.java

@@ -44,6 +44,18 @@
    @Pattern(regexp = "asc|desc|ASC|DESC")
    private String sortType="desc";

    @ApiModelProperty(value = "街路巷")
    private String alley;

    @ApiModelProperty(value = "门牌号")
    private String houseNum;

    @ApiModelProperty(value = "小区组")
    private String groupAt;

    @ApiModelProperty(value = "小区地址")
    private String address;

    public String getSortColumns(){
//        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return sortAttr;