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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActPopulationCultureVO.java

@@ -1,10 +1,10 @@
package com.panzhihua.common.model.vos.screen;

import java.io.Serializable;

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

import java.io.Serializable;

/**
 * @author xyh
@@ -13,7 +13,6 @@
@Data
@ApiModel("实有人口文化程度统计")
public class ComActPopulationCultureVO implements Serializable {


    @ApiModelProperty(value = "文化程度")
    private String level;