Merge branch 'maintenance_feature'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentGoodsSellServiceImpl.java

@@ -136,6 +136,7 @@ public class StudentGoodsSellServiceImpl extends BaseServiceImpl<Integer, Studen
             studentInstrument.setSpecification(goods.getSpecification());
             studentInstrument.setGoodsImg(goods.getImage());
             studentInstrument.setOrderId(order.getId());
+            studentInstrument.setChangeOrderId(order.getId());
             studentInstrument.setStatus(0);
             studentInstruments.add(studentInstrument);
         }

mec-biz/src/main/resources/config/mybatis/StudentInstrumentMapper.xml

@@ -183,7 +183,7 @@
     <select id="getByOrderId" resultMap="StudentInstrument">
         SELECT *
         FROM student_instrument
-        WHERE order_id_ = #{orderId}
+        WHERE change_order_id_ = #{orderId}
     </select>
 
 </mapper>