Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

liujie

6 天以前 39e9e0600ed31ee6eff5c3b1287c36c7b7196b90

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml

@@ -148,7 +148,7 @@
        state as state,
        oldState as oldState,
        thankYouFee
        from t_order_taxi where userId = #{uid} order by insertTime desc limit #{pageNum}, #{size}
        from t_order_taxi where userId = #{uid} and isGenerateRecoveryOrder = 0 order by insertTime desc limit #{pageNum}, #{size}
    </select>