Merge branch 'master' into hemenkou_dev

101captain

2021-12-27 75206d4e4ecd2a7789a21362b85906463d3f2c3d

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

@@ -55,6 +55,9 @@
    @ApiModelProperty(value = "小区地址")
    private String address;

    @ApiModelProperty(value = "网格id")
    private Long gridId;

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