Merge remote-tracking branch 'origin/master'

艾金辉

2023-07-22 64c7668818aa8272c0aae206a3c0f7007ca38e5d

 ard-work/src/main/java/com/ruoyi/alarmpoints/well/domain/ArdAlarmpointsWell.java

@@ -93,4 +93,7 @@

    /** 用户id */
    private String userId;

    /** 关联相机ID */
    private String cameraId;
}