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

liugl

2021-01-07 75ba68eb8d65a32251704c604b3e27f3121808ce

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

@@ -92,7 +92,7 @@


    private fun callOrder() {
        MyApplication.currentOrderId = orderId
//        MyApplication.currentOrderId = orderId
        MyApplication.currentOrderType = orderType
        var map = getMapByAny()
        map["orderId"] = orderId