Merge branch 'dev' into pre

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -688,7 +688,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         class_grade cg  LEFT JOIN class_grade_goods cgg ON cg.grade_id = cgg.grade_id
         LEFT JOIN goods g ON cgg.goods_id = g.goods_id
         WHERE
-        1 = 1
+        cg.status !=-1
         <if test="interfaceAccountId != null and interfaceAccountId== 1">
             AND cg.interface_account_id > 0
         </if>