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

tangxiaobao

2022-03-01 3358b2c450ed5aebfa1ee1aa5f699581b18593a7

 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