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

zhanghua

7 天以前 e1a5409bfa2cca009160a961d9bff827ff133b1b

 ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java

@@ -88,5 +88,5 @@

    @ApiModelProperty("摄像头")
    @TableField("video_id")
    private String videoId;
    private Long videoId;
}