q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
songmingsong
2024-12-06 14:49:59 +08:00
parent fcfb46fed7 1304cf329e
commit 5fc610e438
9 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ycwl/basic/model/mobile/DTO/WeChatUserInfoUpdateDTO.java
View File

@ -22,5 +22,5 @@ public class WeChatUserInfoUpdateDTO {
/**
* 是否同意用户协议，1同意0未同意
*/
private Long id;
private Integer agreement;
}

4
src/main/java/com/ycwl/basic/model/mobile/goods/GoodsVO.java
View File

@ -32,6 +32,6 @@ public class GoodsVO {
private Integer sourceType;
@ApiModelProperty("商品id goodsType为1时才有值")
private Long goodsId;
@ApiModelProperty("视频链接 goodsType为1时才有值")
private String videoUrl;
@ApiModelProperty("模版封面图片")
private String templateCoverUrl;
}

2
src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java
View File

@ -92,4 +92,6 @@ public class OrderReqQuery extends BaseQueryParameterReq {
private Date startRefundTime;
private Date endRefundTime;
@ApiModelProperty("订单类型 0成片（vlog） 1原片 2照片")
private Integer type;
}

6
src/main/java/com/ycwl/basic/model/pc/video/resp/VideoRespVO.java
View File

@ -1,8 +1,6 @@
package com.ycwl.basic.model.pc.video.resp;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycwl.basic.model.common.BaseQueryParameterReq;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -39,7 +37,9 @@ public class VideoRespVO {
@ApiModelProperty("模版名称")
private String templateName;
@ApiModelProperty("模版价格")
private BigDecimal tmplatePrice;
private BigDecimal templatePrice;
@ApiModelProperty("模版封面图片")
private String templateCoverUrl;
@ApiModelProperty("经度")
private BigDecimal longitude;
@ApiModelProperty("纬度")