Merge branch 'dev' into 'master'

fix: 个人订单数量bug

See merge request !5

mini-app/src/main/resources/mapper/order/ServiceOrderBizMapper.xml

@@ -18,7 +18,7 @@
         select count(if(order_status = 3, id, null))                     `pay`,
                count(if(order_status = 1 or order_status = 2, id, null)) `handle`,
                count(if(order_status = 4, id, null))                     `dispatch`,
-               count(if(order_status = 6, id, null))                     `finished`
+               count(if(order_status = 5, id, null))                     `service`
          from service_order
         where account_no = #{accountNo}
     </select>