Merge branch 'four_member' into test

101captain

2021-09-26 8be4769bf80c5e28152875a1428e39a9d369e18c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/BcDictionaryItemVO.java

@@ -1,11 +1,10 @@
package com.panzhihua.common.model.vos;

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

import java.io.Serializable;

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

/**
 * @author manailin
 * @date 2021/6/11 16:27