Merge branch 'test' into 'master'

罗元桥

2021-08-05 cc1098fc00a50cb1591d182f04bc37066ff0a9e2

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwPatrolRecordDO.java

@@ -36,21 +36,6 @@
    private Date patrolTime;

    /**
     * 天气
     */
    private String weather;

    /**
     * 温度
     */
    private String temperature;

    /**
     * 风
     */
    private String wind;

    /**
    * 巡查类型(1.防火巡查2.防汛巡查3.防疫巡查),多条以逗号隔开
    */
    private String patrolType;
@@ -64,6 +49,16 @@
    * 巡查人员
    */
    private String patrolPerson;

    /**
     * 人员名字，多个以逗号隔开
     */
    private String personName;

    /**
     * 人员电话，多个以逗号隔开
     */
    private String personPhone;

    /**
     * 巡查地址
@@ -138,9 +133,6 @@
        return "ComSwPatrolRecordDO{" +
                "id=" + id +
                ", patrolTime=" + patrolTime +
                ", weather=" + weather +
                ", temperature=" + temperature +
                ", wind=" + wind +
                ", patrolType=" + patrolType +
                ", patrolLeader=" + patrolLeader +
                ", patrolPerson=" + patrolPerson +