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

huanghongfa

2021-05-07 d05e79f08a584bac02dc5994c5786863e47b2be4

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

@@ -7,6 +7,7 @@
import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -45,7 +46,7 @@
    private String busScope;

    @ApiModelProperty("服务范围标记：1-全攀枝花市，2-部分地区")
    @NotBlank(groups = {AddGroup.class},message = "服务范围标记不能为空")
    @NotNull(groups = {AddGroup.class},message = "服务范围标记不能为空")
    private Integer areaFlag;

    @ApiModelProperty("商家logo")