Merge remote-tracking branch 'origin/master'

guyue

4 天以前 0fc5865ab5f1df62cb948fbb97c2207b5bd855f9

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java

@@ -187,6 +187,17 @@
    private String responsibilityType;


    @ApiModelProperty("公司名称")
    private String companyName;

    public String getCompanyName() {
        return companyName;
    }

    public void setCompanyName(String companyName) {
        this.companyName = companyName;
    }

    public Integer getAbnormalStatus() {
        return abnormalStatus;
    }
@@ -1056,6 +1067,14 @@
            orderInfoWarpper.setLineShiftTime(null != map.get("lineShiftTime") ? map.get("lineShiftTime").toString() : "");
            orderInfoWarpper.setHolidayFee(null != map.get("holidayFee") ? Double.valueOf(map.get("holidayFee").toString()) : 0);
            orderInfoWarpper.setTaxiCardMoney(null != map.get("taxiCardMoney") ? Double.valueOf(map.get("taxiCardMoney").toString()) : 0);
            orderInfoWarpper.setAppealButton(null != map.get("appealButton") ? Integer.valueOf(map.get("appealButton").toString()) : 0);
            orderInfoWarpper.setAppealStatus(null != map.get("appealStatus") ? Integer.valueOf(map.get("appealStatus").toString()) : 0);
            orderInfoWarpper.setAbnormalStatus(Integer.valueOf(map.get("abnormalStatus").toString()));
            orderInfoWarpper.setAbnormalRemark(null != map.get("abnormalRemark") ? map.get("abnormalRemark").toString() : "");
            orderInfoWarpper.setAbnormalIntro(null != map.get("abnormalIntro") ? map.get("abnormalIntro").toString() : "");
            orderInfoWarpper.setAbnormalImg(null != map.get("abnormalImg") ? map.get("abnormalImg").toString() : "");
            orderInfoWarpper.setResponsibilityType(null != map.get("responsibilityType") ? map.get("abnormalImg").toString() : null);
            orderInfoWarpper.setCompanyName(null != map.get("companyName") ? map.get("companyName").toString() : null);
            orderInfoWarpper.setOrderAdditionalFeeWarpper(list);
        }
        return orderInfoWarpper;