Merge remote-tracking branch 'origin/master'

liuhaonan

2022-02-28 161ec503806c8b71f5caa2d42c2fa9c03ca062d6

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

@@ -83,7 +83,7 @@
     * 绑定灯杆ID
     */
    @TableField(exist = false)
    private Long poleId;
    private Long streetlightId;

    /**
     *