master：推广营销优化；

ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/AdvertController.java

@@ -78,9 +78,9 @@ public class AdvertController extends XktBaseController {
     }
 
     @ApiOperation(value = "获取推广位示例图", httpMethod = "GET", response = R.class)
-    @GetMapping(value = "/demo/{advertType}")
-    public R<String> getDemoPic(@PathVariable Integer advertType) {
-        return R.ok(advertService.getDemoPic(advertType));
+    @GetMapping(value = "/demo/{typeId}")
+    public R<String> getDemoPic(@PathVariable Integer typeId) {
+        return R.ok(advertService.getDemoPic(typeId));
     }
 
 

xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundPageResDTO.java

@@ -43,21 +43,23 @@ public class AdminAdRoundPageResDTO {
     private String endTime;
     @ApiModelProperty(value = "出价")
     private String payPrice;
+    @ApiModelProperty(value = "播放轮次")
+    private Integer playRound;
     @ApiModelProperty(value = "投放状态")
     private Integer launchStatus;
-    @ApiModelProperty(value = "投放状态")
+    @ApiModelProperty(value = "投放状态名称")
     private String launchStatusName;
     @ApiModelProperty(value = "竞价状态")
     private Integer biddingStatus;
-    @ApiModelProperty(value = "竞价状态")
+    @ApiModelProperty(value = "竞价状态名称")
     private String biddingStatusName;
     @ApiModelProperty(value = "图片设计类型")
     private Integer picDesignType;
-    @ApiModelProperty(value = "竞价状态")
+    @ApiModelProperty(value = "图片设计类型名称")
     private String picDesignTypeName;
     @ApiModelProperty(value = "图片是否设置")
     private Integer picSetType;
-    @ApiModelProperty(value = "图片是否设置")
+    @ApiModelProperty(value = "图片是否设置名称")
     private String picSetTypeName;
     @ApiModelProperty(value = "图片审核状态")
     private Integer picAuditStatus;

xkt/src/main/resources/mapper/AdvertRoundMapper.xml

@@ -73,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             s.store_name,
             a.tab_id,
             a.platform_id,
+            a.play_round,
             ar.type_id,
             ar.display_type,
             ar.voucher_date,