Merge branch 'auction-dev' of AHX-Bid/poyee-app into dev

poyee-order/src/main/resources/mapper/LotOrderMapper.xml

@@ -23,8 +23,12 @@
         <result column="lot_image" property="lotImage"/>
         <result column="expire_time" property="expireTime"/>
     </resultMap>
+    <sql id="selectLotOrderSql">
+        select id,order_no,auction_name,lot_name,user_id,status,payment_amount,merchant_id,shipping_address_id,express_id,lot_id,auction_id,create_time,pay_time,service_expense,total_amount,lot_image,expire_time,shipping_address,shipping_address_likename,shipping_address_phone
+        from lot_order_info
+    </sql>
     <select id="selectLotOrder" resultMap="lotOrderResultMap" parameterType="com.tzy.entity.LotOrder">
-        select id,order_no,auction_name,lot_name,user_id,status,payment_amount,merchant_id,shipping_address_id,express_id,lot_id,auction_id,create_time,pay_time,service_expense,total_amount,lot_image,expire_time from lot_order_info
+        <include refid="selectLotOrderSql"/>
         <where>
 
             <if test="orderNo!=null and orderNo!=''">
@@ -40,7 +44,7 @@
         order by create_time desc
     </select>
     <select id="selectLotOrderById" resultMap="lotOrderResultMap">
-        select id,order_no,auction_name,lot_name,user_id,status,payment_amount,merchant_id,shipping_address_id,express_id,lot_id,auction_id,create_time,pay_time,service_expense,total_amount,lot_image,expire_time from lot_order_info
+        <include refid="selectLotOrderSql"/>
         where id=#{id}
     </select>
     <select id="countLotOrderByLotId" parameterType="com.tzy.entity.LotOrder" resultType="int">