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

liugl

2020-12-31 5af5d1d3134ebd217630c07245dd072942cbf9a4

 app/src/main/java/com/okgoincar/bean/OrderListBean.java

@@ -59,6 +59,15 @@
        private String time;
        private int type;
        private double orderMoney;
        private Integer payManner;

        public Integer getPayManner() {
            return payManner;
        }

        public void setPayManner(Integer payManner) {
            this.payManner = payManner;
        }

        public double getOrderMoney() {
            return orderMoney;