修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferCompanyResourcesMapper.xml

@@ -28,6 +28,8 @@
    d.rec_date,
    d.car_status,
    d.remarks,
+   d.arrival_time,
+   d.car_user,
    d.is_delete,
 	CASE  d.status
 	WHEN 'executing' THEN '未完成'

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -1138,9 +1138,9 @@ public class CommandController extends BaseController {
             File htmlFile = new File(htmlFileName);
             WordConverterUtils.wordToHtml(fileName, htmlFileName, imagePathStr, readUrl, remoteSecurityService, product, appKey, token);
             FileInputStream fis = new FileInputStream(htmlFile);
-//			response.setContentType("multipart/form-data");
-//			response.setCharacterEncoding("UTF-8");
-//			response.setContentType("text/html");
+			response.setContentType("multipart/form-data");
+			response.setCharacterEncoding("UTF-8");
+			response.setContentType("text/html");
             ServletOutputStream out;
             out = response.getOutputStream();
             int b = 0;