记得上下班打卡 | git大法好,push需谨慎

Commit 26367edd authored by zhouhuan's avatar zhouhuan

Merge branch 'master_zhouhuan' into pre

parents 4f2f3777 6bc86119
...@@ -79,7 +79,7 @@ public class ToolsBaseController extends BaseController { ...@@ -79,7 +79,7 @@ public class ToolsBaseController extends BaseController {
return error("查无订单"); return error("查无订单");
} }
ExcelUtil<OrderExportVo> util = new ExcelUtil(OrderExportVo.class); ExcelUtil<OrderExportVo> util = new ExcelUtil(OrderExportVo.class);
return util.exportExcel(list, list.get(0).getPerformanceTitle() + "-" + mobileType); return util.exportExcel(list, mobileType+"");
} }
/** /**
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
height: 400px; height: 400px;
} }
.img-Approval{ .img-Approval{
width-max:300px; max-width:300px;
height: 400px; height: 400px;
} }
</style> </style>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment