Merge remote-tracking branch 'origin/dev' into dev

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -468,7 +468,6 @@
                 LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
                 LEFT JOIN class_grade cg on cg.grade_id = cgu.grade_id
                 LEFT JOIN goods g on g.goods_id=og.goods_id
-                LEFT JOIN order_goods og on cgu.order_goods_id = og.order_goods_id
                 LEFT JOIN course_education_type cet ON g.education_type_id = cet.id
                 LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
                 LEFT JOIN course_business cb ON g.business_id = cb.id