From f5ca8f01cf6b8256a25e8c6838d805fe3fca43fc Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 07 八月 2023 11:34:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/CourseOfStoreVo.java | 33 +++++----------------------------
1 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/CourseOfStoreVo.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/CourseOfStoreVo.java
index 3314e08..3591609 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/CourseOfStoreVo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/CourseOfStoreVo.java
@@ -3,15 +3,12 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.util.ArrayList;
-import java.util.List;
-
@Data
public class CourseOfStoreVo {
@ApiModelProperty(value = "课包id")
- private Integer courseId;
+ private Long courseId;
@ApiModelProperty(value = "课包名称")
private String courseName;
@@ -22,14 +19,11 @@
@ApiModelProperty(value = "课包结束时间")
private String classEndTime;
- @ApiModelProperty(value = "课包 周列表 分号隔开1;2;3;4;5")
- private String classWeeks;
-
@ApiModelProperty(value = "门店id")
private Integer storeId;
- @ApiModelProperty(value = "门店名称")
- private String storeName;
+ @ApiModelProperty(value = "门店详细地址")
+ private String storeAddress;
@ApiModelProperty(value = "经度")
private String lat;
@@ -37,23 +31,6 @@
@ApiModelProperty(value = "纬度")
private String lon;
- public CourseOfStoreVo(Integer courseId, String courseName, Integer storeId, String storeName,String classWeeks) {
- this.courseId = courseId;
- this.courseName = courseName;
- this.storeId = storeId;
- this.storeName = storeName;
- this.classWeeks = classWeeks;
- }
- @ApiModelProperty(value = "周列表")
- private List<Integer> classWeekList;
-
- public List<Integer> getClassWeekList() {
- String[] split = this.classWeeks.split(";");
- List<Integer> integers = new ArrayList<>();
- for (String s : split) {
- int num = Integer.parseInt(s);
- integers.add(num);
- }
- return integers;
- }
+ @ApiModelProperty(value = "课包课时价格")
+ private double coursePrice;
}
--
Gitblit v1.7.1