Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-08-31 06650302163e395c038b37a10d5c4214ba9cc8a9

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/EventResourceDTO.java

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

import java.io.Serializable;

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

import java.io.Serializable;

/**
 * @author xyh