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

tangxiaobao

2021-09-15 1b9b482e6c55f043a586665b84d2d0feb8daa397

 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