Merge remote-tracking branch 'origin/master'

liugl

2020-11-02 c2877e03172d68af0a0eacd56ac0f5d4c67c6f26

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

@@ -58,6 +58,15 @@
        private int state;
        private String time;
        private int type;
        private double orderMoney;

        public double getOrderMoney() {
            return orderMoney;
        }

        public void setOrderMoney(double orderMoney) {
            this.orderMoney = orderMoney;
        }

        public String stateStr(){
            switch (state){