Merge remote-tracking branch 'origin/master'

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/core/service/dto/BaseDTO.java

@@ -17,6 +17,21 @@ public abstract class BaseDTO<T> implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
+     * taskId
+     */
+    protected String taskId;
+
+    /**
+     * 流程id
+     */
+    protected String procInsId;
+
+    /**
+     * 流程信息
+     */
+    protected String processDefinitionId;
+
+    /**
      * 实体主键
      */
     @ExcelIgnore

jeeplus-common/jeeplus-common-mybatis-plus/target/generated-sources/annotations/com/jeeplus/database/datalink/service/mapstruct/DataSourceWrapperImpl.java

@@ -11,8 +11,8 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-05-22T14:22:00+0800",
-    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_181 (Oracle Corporation)"
+    date = "2023-06-01T14:23:44+0800",
+    comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_211 (Oracle Corporation)"
 )
 @Component
 public class DataSourceWrapperImpl implements DataSourceWrapper {