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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.java

@@ -4,7 +4,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.omg.PortableInterceptor.INACTIVE;


import javax.validation.constraints.NotBlank;
import java.util.Date;
@@ -56,4 +56,7 @@

    @ApiModelProperty("是否累加门牌号 0 否 1 是")
    private Integer isAccumulation;

    @ApiModelProperty("小区门牌号导入规则")
    private String doorNum;
}