Merge remote-tracking branch 'origin/master'

CeDo

2021-04-27 4f9334315ae6dc279f128d0c940f82d881d10b89

 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;