Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

liujie

8 天以前 3a0bef313cbc6cd71bcb234d208805c022827e13

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java

@@ -203,6 +203,7 @@
            shellList.add("是否推广订单");
            shellList.add("推广员姓名");
            shellList.add("推广员电话");
            shellList.add("所属公司");
            dataList.add(shellList);

            for (Map<String,Object> object : list){
@@ -295,11 +296,6 @@
                    shellList.add("-");
                }

                if(SinataUtil.isNotEmpty(object.get("contactPersonPhone"))){
                    shellList.add(object.get("contactPersonPhone").toString());
                }else{
                    shellList.add("-");
                }

                if(SinataUtil.isNotEmpty(object.get("startAddress"))){
                    shellList.add(object.get("startAddress").toString());
@@ -409,6 +405,11 @@
                }else{
                    shellList.add("-");
                }
                if(SinataUtil.isNotEmpty(object.get("companyName"))){
                    shellList.add(object.get("companyName").toString());
                }else{
                    shellList.add("-");
                }


                dataList.add(shellList);