From 650d2085cdf95516ec2c4b9caf76d02a6b1e24af Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期二, 21 二月 2023 18:13:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java | 2 +-
ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java | 1 +
ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java | 1 +
ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java | 4 ++--
document/接口文档202210.docx | 0
5 files changed, 5 insertions(+), 3 deletions(-)
diff --git "a/document/\346\216\245\345\217\243\346\226\207\346\241\243202210.docx" "b/document/\346\216\245\345\217\243\346\226\207\346\241\243202210.docx"
new file mode 100644
index 0000000..2f39591
--- /dev/null
+++ "b/document/\346\216\245\345\217\243\346\226\207\346\241\243202210.docx"
Binary files differ
diff --git a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
index 379aa97..d63a3ba 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
+++ b/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) {
diff --git a/ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java b/ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java
index 9e28e1f..d2ecdb8 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java
+++ b/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;
}
diff --git a/ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java b/ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java
index 6c5ed45..2572568 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java
+++ b/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;
}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java b/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java
index 82e7114..934d9f2 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java
@@ -89,5 +89,6 @@
private VideoPoint videoPoint;
@ApiModelProperty("鐘舵��")
+ @TableField("status")
private Integer status;
}
\ No newline at end of file
--
Gitblit v1.8.0