Merge branch 'master' into pre

netflix-dao/src/main/resources/mapper/GroupRelationMapper.xml

@@ -222,7 +222,7 @@
             and type = 1
         </if>
         <if test="filterCourseGoods!=null and filterCourseGoods">
-            and special_type != 'courseware'
+            (and special_type is null or special_type != 'courseware')
         </if>
         and deleted is true and status is true) s order by s.sorted desc,sort_by asc
     </select>

netflix-web/src/main/java/com/cyksj/web/controller/goods/GoodsDonController.java

@@ -1035,7 +1035,7 @@ public class GoodsDonController {
 				data.setDays(minPriceUserOwnsSku.getDays());
 			}
 			//课件类型 且过滤
-			if (filterCourseGoods.get() && data.getSpecialType() == GoodsDon.SpecialType.courseware) {
+			if (filterCourseGoods.get() && data.getSpecialType() != null && data.getSpecialType() == GoodsDon.SpecialType.courseware) {
 				return false;
 			}
 			//设置特定价格