Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2024-10-28 17:47:06 +08:00
commit 83f4c03b47
1 changed files with 3 additions and 2 deletions

View File

@ -7,6 +7,7 @@ import lombok.ToString;
import com.bonus.common.core.web.domain.BaseEntity; import com.bonus.common.core.web.domain.BaseEntity;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
/** /**
@ -38,7 +39,7 @@ public class BmUnit extends BaseEntity
/** 单位类型 */ /** 单位类型 */
@ApiModelProperty(value = "单位类型") @ApiModelProperty(value = "单位类型")
@NotBlank(message = "单位类型不能为空") @NotNull(message = "单位类型不能为空")
private Long typeId; private Long typeId;
@Excel(name = "单位类型") @Excel(name = "单位类型")
@ -47,7 +48,7 @@ public class BmUnit extends BaseEntity
/** 所属分公司 */ /** 所属分公司 */
@ApiModelProperty(value = "所属分公司") @ApiModelProperty(value = "所属分公司")
@NotBlank(message = "所属分公司不能为空") @NotNull(message = "所属分公司不能为空")
private Long deptId; private Long deptId;
@Excel(name = "所属分公司") @Excel(name = "所属分公司")