Merge branch 'dev_1_3_2_20220815' of http://git.dayaedu.com/yonge/cooleshow into dev_1_3_2_20220815

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityRewardController.java

@@ -144,6 +144,7 @@ public class ActivityRewardController extends BaseController {
     @ApiOperation(value = "库存变更记录查询分页", notes = "传入activityRewardChangeStockSearch")
     @PreAuthorize("@pcs.hasPermissions('activityReward/selectChangeStockPage')")
     public HttpResponseResult<PageInfo<ActivityRewardChangeStockVo>> selectChangeStockPage(@RequestBody ActivityRewardChangeStockSearch query) {
+        query.setSource("ADMIN");
         IPage<ActivityRewardChangeStockVo> pages = activityRewardService.selectChangeStockPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/TeacherApplyDetailReq.java

@@ -57,7 +57,7 @@ public class TeacherApplyDetailReq implements Serializable {
     @ApiModelProperty("教师资格证 ")
     private String teacherCertificate;
 
-    @ApiModelProperty("老师风采视频json 格式：[{'videoUrl':'视频地址','cover':'视频地址'},{'videoUrl':'视频地址','cover':'视频地址'}] ,将单引号替换为双引号")
+    @ApiModelProperty("老师风采视频json 格式：[{'videoUrl':'视频地址','cover':'视频封面地址'},{'videoUrl':'视频地址','cover':'视频封面地址'}] ,将单引号替换为双引号")
     @NotBlank(message = "至少要有一个老师风采视频")
     private String styleVideoJson;
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityPlanRewardServiceImpl.java

@@ -119,7 +119,7 @@ public class ActivityPlanRewardServiceImpl extends ServiceImpl<ActivityPlanRewar
                                                         changeStock = detail.getStock();
                                                     }
 
-                                                    param.setRewardNum(param.getRewardNum() + changeStock);
+                                                    param.setRewardNum(old.getRewardNum() + changeStock);
                                                     updateById(param);
                                                     //入库存变更记录
                                                     ActivityRewardChangeStock changeStockObj = new ActivityRewardChangeStock();