Merge branch 'master_billOrder' into develop

src/main/resources/au/com/royalpay/payment/manage/mappers/bill/BillMapper.xml

@@ -5,7 +5,7 @@
     <select id="listWithOrderAnalysis" resultType="com.alibaba.fastjson.JSONObject" >
         select b.bill_id,b.status,b.currency,DATE_FORMAT(b.create_time,'%Y-%c-%e') create_date, DATE_FORMAT(b.create_time,'%H:%m:%s') create_time,b.remark,b.price,count(o.bill_order_id) order_counts,sum(o.order_total_amount) order_total_amount
         from pmt_bill b left join  pmt_bill_order o
-        on   b.bill_id = o.bill_id and o.order_status &lt; 2
+        on   b.bill_id = o.bill_id and o.order_status = 1
         <where>
              b.client_id = #{param.client_id}
             <if test="param.status != null">