Merge branches 'cargo_small' and 'master' of http://sinata.cn:10101/gitblit...

liugl

2020-12-31 5af5d1d3134ebd217630c07245dd072942cbf9a4

 app/src/main/java/com/okgoincar/slab/SlabOrderListAdapter.kt

@@ -20,7 +20,7 @@
        holder?.let {
            setblack(getNowTimeBlack(),it.itemView)
            it.itemView.tv_time.text = item!!.time
            it.itemView.tv_money.text = "订单金额：¥"+item!!.orderMoney
            it.itemView.tv_money.text = "订单金额：¥"+item!!.orderMoney+"("+if (item.payManner == 1)"线上)" else "线下)"
        }
    }