Merge branch 'hemenkou_dev' into dev

101captain

2022-03-10 20b528c879f3e96bf72516f58ac7341b204b12be

 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