Merge remote-tracking branch 'origin/master'

MercuryZ

2022-03-31 ef270bd1855b5ce3f398c5df024840a498e33a8f

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

@@ -38,6 +38,11 @@
    private Integer deviceType;

    /**
     * 
     */
    private Long userId;

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