Merge branch 'test' into 'master'

罗元桥

2021-07-31 ae84b84b6a1bf77f112ac01c858899be60d89300

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java

@@ -1,6 +1,5 @@
package com.panzhihua.common.model.dtos.community;

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;
@@ -44,13 +43,13 @@
    /**
    * 巡查领导
    */
    @ApiModelProperty("巡查领导")
    @ApiModelProperty("巡查领导id")
    private String patrolLeader;

    /**
    * 巡查人员
    */
    @ApiModelProperty("巡查人员")
    @ApiModelProperty("巡查人员id")
    private String patrolPerson;

    /**
@@ -164,7 +163,7 @@
    /**
    * 整改人员
    */
    @ApiModelProperty("整改人员")
    @ApiModelProperty("整改人员id")
    private String rectifyPerson;

    /**