Merge branch 'develop' into release

tuoheng-api/src/main/java/com/tuoheng/api/service/impl/WestreamVideoServiceImpl.java

                             userPointsDetail.setNickname(westreamUser.getNickname());
                             userPointsDetail.setPointsChange(Integer.parseInt(thDictData.getValue()));
                             userPointsDetail.setPointsTime(new Date());
-                            userPointsDetail.setChangeName("观看学习视频"+query.getVideoId());
+                            userPointsDetail.setChangeName("观看学习视频");
                             userPointsDetail.setType(1);
                             userPointsDetail.setCreateTime(new Date());
                             userPointsDetailMapper.insert(userPointsDetail);