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/PageComMngPopulationDTO.java

@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * 分页查询表单
 *
@@ -25,4 +27,7 @@
    @ApiModelProperty(value = "关键词")
    private String keyWord;

    @ApiModelProperty(value = "已选中实有人口id集合")
    private List<Long> populationIds;

}