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

tangxiaobao

2022-02-22 4e1bb5d40063abfa1f43206b4ba91a26fac1cae7

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

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

import java.io.Serializable;

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

import java.io.Serializable;

/**
 * @author manailin