Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop

CODE/smart-community/app-api/src/main/resources/mapper/TpBillInvoiceMapper.xml

@@ -233,7 +233,8 @@
           b.bill_name AS billName,
           b.bill_explain AS billExplain,
           b.end_date AS endDate,
-          b.create_date AS createDate
+          b.create_date AS createDate,
+          i.out_trade_no AS outTradeNo
       FROM
           tp_bill_invoice i
           LEFT JOIN tp_bill b ON b.id = i.bill_id

VUECODE/smart-property-manage/src/views/bill/statement/index.vue

@@ -161,6 +161,9 @@ export default {
         case '1':
           str = '线下缴费'
           break
+        case '2':
+          str = '支付宝缴费'
+          break
       }
       return str
     },