Merge branch 'test' into 'master'

罗元桥

2021-08-31 a25c8f0ccfe35369e0c60d02bf9a3309ad650dfa

 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