Merge branch 'dev_1_3_5_20220831'

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/NewsController.java

@@ -259,7 +259,7 @@ public class NewsController extends BaseController {
 		// 1热门资讯
 		queryInfo.setType(1);
 		queryInfo.setPage(1);
-		queryInfo.setRows(3);
+		queryInfo.setRows(param.getNewsLimit());
 		Map<String, Object> params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);
 		List<SysNewsInformationDto> rows = sysNewsInformationService.selectPage(queryInfo).getRows();

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dto/AppParam.java

@@ -21,6 +21,16 @@ public class AppParam {
     @ApiModelProperty("老师端：TEACHER 学生端：STUDENT")
     private String clientType;
 
+    @ApiModelProperty("个人资讯条数 默认10条")
+    private int newsLimit = 10;
+
+    public int getNewsLimit() {
+        return newsLimit;
+    }
+
+    public void setNewsLimit(int newsLimit) {
+        this.newsLimit = newsLimit;
+    }
 
     public String getClientType() {
         return clientType;

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityPlanRewardMapper.xml

@@ -46,7 +46,7 @@
         , ar.reward_client_ as "activityReward.rewardClient"
         , ar.reward_name_ as "activityReward.rewardName"
         , ar.reward_type_ as "activityReward.rewardType"
-        , ar.reward_describe_ "activityReward.as rewardDescribe"
+        , ar.reward_describe_ "activityReward.rewardDescribe"
         , ar.img_url_ as "activityReward.imgUrl"
         , ar.stock_ as "activityReward.stock"
         , ar.num_ as "activityReward.num"

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -620,7 +620,7 @@
         LEFT JOIN `subject` s ON g.lesson_subject_=s.id_
         LEFT JOIN (SELECT video_lesson_group_id_ ,COUNT(1) AS count_ FROM video_lesson_purchase_record WHERE order_status_='PAID' GROUP BY video_lesson_group_id_) r ON g.id_= r.video_lesson_group_id_
         WHERE u.del_flag_ = 0 and g.audit_status_='PASS' and g.shelves_flag_ = 1 and #{appAuditVersion} = g.audit_version_
-        ORDER BY buyCount DESC LIMIT 4
+        ORDER BY buyCount DESC LIMIT 10
     </select>
     <select id="selectRecentCourses" resultType="com.yonge.cooleshow.biz.dal.vo.StudentHomePage$RecentCourses">
         SELECT