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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

@@ -1,13 +1,15 @@
package com.panzhihua.common.model.vos.community;

import java.io.Serializable;
import java.util.Date;

import javax.validation.constraints.NotBlank;

import com.panzhihua.common.validated.AddGroup;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;

/**
 * @description: 便民服务 分类信息
@@ -22,14 +24,14 @@
    private Long id;

    @ApiModelProperty("分类名称")
    @NotBlank(groups = {AddGroup.class},message = "分类名称不能为空")
    @NotBlank(groups = {AddGroup.class}, message = "分类名称不能为空")
    private String name;

    @ApiModelProperty("备注")
    private String remark;

    @ApiModelProperty("权重")
    @NotBlank(groups = {AddGroup.class},message = "权重不能为空")
    @NotBlank(groups = {AddGroup.class}, message = "权重不能为空")
    private Integer weight;

    @ApiModelProperty("创建人")