Merge remote-tracking branch 'origin/master'

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

@@ -36,6 +36,7 @@
     <resultMap type="com.ym.mec.biz.dal.entity.StudentPaymentOrder" extends="StudentPaymentOrder"
                id="PaymentOrderAndStudentInfo">
         <result column="username_" property="user.username"/>
+        <result column="phone_" property="user.phone"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.entity.Goods" id="Goods">
@@ -176,7 +177,7 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="PaymentOrderAndStudentInfo" parameterType="map">
-        SELECT spo.*,u.username_ FROM student_payment_order spo
+        SELECT spo.*,u.username_,u.phone_ FROM student_payment_order spo
         left join sys_user u on spo.user_id_ = u.id_
         <include refid="queryPaymentOrder"/>
         ORDER BY spo.id_ DESC