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

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

import java.io.Serializable;

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

import java.io.Serializable;

/**
 * 实有人口编辑请求参数
@@ -25,7 +25,7 @@
    /**
     * 是否是居住地(1.是 0.否)
     */
    public interface isResidence{
    public interface isResidence {
        int yes = 1;
        int no = 0;
    }