Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

101captain

2022-08-16 6a9a7c841728a090ed1eaa66be1d3c335ee75206

Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ServiceDetailStaticsVO.java

@@ -3,6 +3,8 @@
import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,6 +20,7 @@
@ApiModel("服务明细")
public class ServiceDetailStaticsVO {
    @ApiModelProperty("关联id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long serviceId;
    @ApiModelProperty("服务时长")
    private Integer serviceTime;