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

huanghongfa

2021-09-16 a824e3b0f4b9f2f1d45f7195eb1fec2a6f5ba2a9

 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