Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/domain/WorkContractInfo.java

@@ -144,4 +144,10 @@ public class WorkContractInfo extends BaseEntity {
 
     @TableField(exist = false)
     private String[] contractAmounts;
+
+    @TableField(exist = false)
+    private String taskId;
+
+    @TableField(exist = false)
+    private String createId;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/mapper/xml/WorkContractInfoMapper.xml

@@ -35,10 +35,13 @@
 			a.process_definition_id,
 			a.status,
 			a.filed_type,
-			a.borrow_type
+			a.borrow_type,
+			b.ID_ as task_id,
+			a.create_by as create_id
 		FROM
 			work_contract_info a
 			LEFT JOIN sys_user c ON a.create_by = c.id
+			LEFT JOIN act_ru_task b ON a.proc_ins_id = b.PROC_INST_ID_
 		${ew.customSqlSegment}
 		ORDER BY a.update_date DESC
 	</select>