Merge remote-tracking branch 'origin/master'

baizonghao

2023-02-21 650d2085cdf95516ec2c4b9caf76d02a6b1e24af

Merge remote-tracking branch 'origin/master'

 document/½Ó¿ÚÎĵµ202210.docx

Binary files differ

 ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java

@@ -88,6 +88,7 @@
                .description(umsStoreInfoParam.getDescription())
                .videoId(umsStoreInfoParam.getRelationVideo())
                .storeScore(100.0)
                .status(umsStoreInfoParam.getStatus())
                .build();
        boolean success = storeInfoService.save(storeInfo);
        if (success) {

 ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java

@@ -51,9 +51,9 @@
    private String description;

    @ApiModelProperty("摄像头")
    private String relationVideo;
    private Long relationVideo;

    @ApiModelProperty("店铺状态")
    @TableField("status")
    private String status;
    private Integer status;
}

 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;
}

 ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java

@@ -89,5 +89,6 @@
    private VideoPoint videoPoint;

    @ApiModelProperty("状态")
    @TableField("status")
    private Integer status;
}