Merge remote-tracking branch 'origin/master'

Pu Zhibing

8 天以前 a139dba9262dbb4b70f34d3c2034c255561abcad

 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;
    }