Merge branch 'test' into 'zzj'

罗元桥

2021-09-16 5dc04f3291c00d66f8733a49896612ea1e3b31c5

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java

@@ -58,6 +58,12 @@
    private String patrolType;

    /**
     * 巡查领导id
     */
    @ApiModelProperty("巡查领导id")
    private String patrolLeader;

    /**
     * 巡查人员
     */
    @ApiModelProperty("巡查人员")
@@ -123,6 +129,37 @@
    private String personName;

    /**
     * 接班领导id
     */
    @ApiModelProperty("接班领导id")
    private String successionLeader;

    /**
     * 接班领导名字
     */
    @ApiModelProperty("接班领导名字")
    private String successionLeaderName;

    /**
     * 接班人员id
     */
    @ApiModelProperty("接班人员id")
    private String successionPerson;

    /**
     * 接班人员名字
     */
    @ApiModelProperty("接班人员名字")
    private String successionPersonName;

    /**
     * 接班时间
     */
    @ApiModelProperty("接班时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date successionTime;

    /**
     * 巡查类型
     */
    public interface patrolType {