Merge branch 'four_member' into test

101captain

2021-09-26 8be4769bf80c5e28152875a1428e39a9d369e18c

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

@@ -1,10 +1,10 @@
package com.panzhihua.common.model.dtos.grid;

import javax.validation.constraints.NotNull;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;

/**
 * @ClasssName SpecialPopulationDTO