Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

7 天以前 e1a5409bfa2cca009160a961d9bff827ff133b1b

 ycl-platform/src/main/java/com/ycl/entity/video/VideoAlarmReport.java

@@ -87,4 +87,7 @@
    @ApiModelProperty("算法检出对象在图片中的坐标")
    @TableField("alarm_obj")
    private String alarmObj;

    @TableField(exist = false)
    private byte[] picByte;
}