Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test

pom.xml

@@ -17,7 +17,7 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.41</revision>
+        <revision>3.0.42</revision>
         <!-- Maven 相关 -->
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainPageReqVO.java

@@ -15,7 +15,7 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 public class ReportDocumentMainPageReqVO extends PageParam {
 
     @Schema(description = "流程实例ID", example = "10765")
-    private Long flowInstanceId;
+    private String flowInstanceId;
 
     @Schema(description = "报告类型ID", example = "2124")
     private Long reportDocumentTypeId;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainRespVO.java

@@ -19,7 +19,7 @@ public class ReportDocumentMainRespVO {
 
     @Schema(description = "流程实例ID", example = "10765")
     @ExcelProperty("流程实例ID")
-    private Long flowInstanceId;
+    private String flowInstanceId;
 
     @Schema(description = "报告类型ID", example = "2124")
     @ExcelProperty("报告类型ID")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainSaveReqVO.java

@@ -15,7 +15,7 @@ public class ReportDocumentMainSaveReqVO {
     private Long id;
 
     @Schema(description = "流程实例ID", example = "10765")
-    private Long flowInstanceId;
+    private String flowInstanceId;
 
     @Schema(description = "报告类型ID", example = "2124")
     private Long reportDocumentTypeId;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentMainDO.java

@@ -35,7 +35,7 @@ public class ReportDocumentMainDO extends BusinessBaseDO {
     * 流程实例ID
     */
     @TableField("FLW_INSC_ID")
-    private Long flowInstanceId;
+    private String flowInstanceId;
     /**
     * 报告类型ID
     */