Merge branch 'master' of http://git.dayaedu.com/yonge/collect_fee

src/main/resources/config/mybatis/OrderMapper.xml

@@ -167,7 +167,7 @@
     <select id="getOrderByOrderNo" resultMap="Order">
 		SELECT * FROM `order` WHERE `order_no` = #{orderNo} AND `status` = 1
 	</select>
-    <select id="findOrderByStatus" resultType="com.ym.mec.collectfee.entity.Order">
+    <select id="findOrderByStatus" resultMap="Order">
 		SELECT * FROM `order` WHERE `user_id` = #{userId} AND `status` = #{status}
 	</select>
     <!-- 获取支付中和成功的订单数-->