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

liugl

2020-12-31 5af5d1d3134ebd217630c07245dd072942cbf9a4

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

@@ -82,6 +82,28 @@
        private String type;
        private String emergencyCall;
        private String peopleNumber;
        private String  differenceMoney;
        private String cargoType;

        public String getCargoType() {
            return cargoType;
        }

        public void setCargoType(String cargoType) {
            this.cargoType = cargoType;
        }

        public void setTipMoney(Double tipMoney) {
            this.tipMoney = tipMoney;
        }

        public String getDifferenceMoney() {
            return differenceMoney;
        }

        public void setDifferenceMoney(String differenceMoney) {
            this.differenceMoney = differenceMoney;
        }

        public String getPeopleNumber() {
            return peopleNumber;