Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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

@@ -38,6 +38,15 @@
    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

    @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)",hidden = true)
    private Integer isReport;

    @ApiModelProperty(value = "是否公示(0.否 1.是)",hidden = true)
    private Integer isPublicity;

    @ApiModelProperty(value = "处理状态（1.待处理 2.已处理）",hidden = true)
    private Integer handleStatus;

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