Merge branch 'local_20221014' into huacheng_test

yanghui

2022-10-17 a9a660a85f54911a76aefd1eb29a3af0c7b0e419

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysOperLogVO.java

@@ -1,12 +1,11 @@
package com.panzhihua.common.model.vos.user;

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;

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

import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -83,4 +82,12 @@

    @ApiModelProperty("如果是修改操作，记录修改前的记录")
    private String beforeUpdateData;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty("开始时间")
    private String startTime;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty("截止时间")
    private String endTime;
}