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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationTagDTO.java

@@ -1,13 +1,12 @@
package com.panzhihua.common.model.dtos.community;

import java.io.Serializable;

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

import java.io.Serializable;
import java.util.Date;

/**
 *  实有人口DTO
 * 实有人口DTO
 */
@Data
public class ComMngPopulationTagDTO implements Serializable {
@@ -16,14 +15,13 @@
    /**
     * 主键id
     */
    @ApiModelProperty(value="主键id")
    @ApiModelProperty(value = "主键id")
    private Long id;

    /**
     * 标签字符串（多个以,隔开）
     */
    @ApiModelProperty(value="标签字符串")
    @ApiModelProperty(value = "标签字符串")
    private String label;


}