fix 合并

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

@@ -315,7 +315,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (SELECT COUNT(DISTINCT ubr.module_id,ubr.chapter_id,ubr.exam_id) FROM user_bank_record ubr LEFT JOIN class_grade_goods cgg on cgg.goods_id = ubr.goods_id where ubr.`status`=1 and ubr.user_id = u.user_id and ubr.grade_id = cgu.grade_id and ubr.report_status=1 and ubr.current_status = 1) as record_num,
         (og.study_count) as study_count,
         og.order_goods_id,
-        og.rebuy
+        og.rebuy_order_goods_id
         FROM
         class_grade_user cgu
         LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id

zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             g.cover_url,
             g.code,
             og.goods_price,
-            og.rebuy,
+            og.rebuy_order_goods_id,
             og.order_goods_id,
             og.goods_real_price,
             og.status as order_goods_status,