Merge branch 'test' into 'master'

罗元桥

2021-09-07 a0f6c9c91b61503a97a17fe2ecc2775afb75fda1

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EventWorkScreenVO.java

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

import java.io.Serializable;
import java.util.List;

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

import java.io.Serializable;
import java.util.List;

/**
 * @author lyq