Merge remote-tracking branch 'origin/master'

liuhaonan

2022-03-11 da823ef0819982dfa74bb0b7a9ce6d534d2fcc2d

 dao/src/main/java/com/sandu/ximon/dao/domain/Pole.java

@@ -33,6 +33,11 @@
    private String poleName;

    /**
     * 设备类型  01 是CAT1 00 是MQTT串口主板
     */
    private Integer deviceType;

    /**
     * 客户id
     */
    private Long clientId;