Merge branch 'test' into 'yuyue_dev'

罗元桥

2021-08-30 eda58e0e6d4abdd2b060e28867d103045845aa69

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/PopulationStatisticsVO.java

@@ -10,17 +10,17 @@
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
 */
@Data
@ApiModel("居民统计返回参数")
public class PopulationStatisticsVO {

    @ApiModelProperty(value = "本地人口")
   private Integer localNum = 0;
    private Integer localNum = 0;

    @ApiModelProperty(value = "流动人口")
   private Integer flowNum = 0;
    private Integer flowNum = 0;

   @ApiModelProperty(value = "特殊人口")
    @ApiModelProperty(value = "特殊人口")
    private Integer specialNum = 0;
}