merge

zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/CommonController.java

@@ -101,7 +101,7 @@ public class CommonController extends BaseController {
         map.put("hide",false);
         if(Validator.isNotEmpty(bo.getVersion())){
             if(bo.getVersion().equals("5.2.6")){
-                map.put("hide",true);
+                map.put("hide",false);
             }
         }
         return AjaxResult.success(map);

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsCourseMapper.xml

@@ -108,5 +108,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN course_subject cs ON cs.id = c.subject_id
         WHERE
             gc.goods_id = #{goods_id} AND c.`status` = 1
+        order by gc.sort
     </select>
 </mapper>