Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/workorder/generate/GenerateWorkorderService.java

@@ -148,7 +148,7 @@ public class GenerateWorkorderService {
      */
     private WorkOrder insertWorkOrder(User user) {
         WorkOrder workOrder = new WorkOrder();
-        String code = DateUtils.generateCode("XJRW");
+        String code = DateUtils.generateCode("XJGD");
         workOrder.setCode(code);
         workOrder.setTenantId(user.getTenantId());
         workOrder.setDeptId(user.getDeptId());

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/inspection/InspectionFileReportVo.java

@@ -25,7 +25,7 @@ public class InspectionFileReportVo {
     /**
      * 问题名称：1坑槽，2积水，3裂缝
      */
-    private Integer questionName;
+    private String questionName;
 
     /**
      * 缩略图

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionFileServiceImpl.java

@@ -497,7 +497,7 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
                     throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL);
                 }
                 if (null != questionType.getName()) {
-                    vo.setQuestionName(questionType.getName());
+                    vo.setQuestionName(questionType.getContent());
                 }
                 if (StringUtils.isNotEmpty(questionType.getContent())) {
                     vo.setContent(questionType.getContent());

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/vo/InspectionFileInfoVo.java

@@ -26,7 +26,7 @@ public class InspectionFileInfoVo {
     /**
      * 问题类型
      */
-    private Integer questionName;
+    private String questionName;
 
     /**
      * 问题类型名称