Merge branch 'test' into zzj

101captain

2021-08-30 ea6b0efbfd58ab4a2f0a7c9f504688e7f4e12102

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberWarnLogAdminVO.java

@@ -1,11 +1,10 @@
package com.panzhihua.common.model.vos.grid;

import com.fasterxml.jackson.annotation.JsonFormat;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 *
@@ -13,7 +12,7 @@
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
 */
@Data
@ApiModel("网格员预警记录返回参数")
public class EventGridMemberWarnLogAdminVO {