Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-28 22a8cf0fc39555be78a030d208215fa7f6ad6bc4

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

@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.NotBlank;
import java.io.Serializable;
@@ -40,6 +41,7 @@

    @ApiModelProperty("主营业务")
    @NotBlank(groups = {AddGroup.class},message = "主营业务不能为空")
    @Length(groups = {AddGroup.class}, max=500)
    private String busScope;

    @ApiModelProperty("服务范围标记：1-全攀枝花市，2-部分地区")