Merge remote-tracking branch 'core/dev' into dev

@CONTROL/移动端多项数据控件/MODEL.ts.ftl

@@ -54,30 +54,38 @@
         </#if>
     </#list>
 </#if>
-
 <#if view.hasPSControl('searchform')>
 ${P.getCtrlCode('searchform', 'MODEL_CONTENT.ts').code}
 </#if>
 			{
-                name:'size',
-                prop:'size'
+				name: 'size',
+				prop: 'size'
 			},
 			{
-                name:'query',
-                prop:'query'
+				name: 'query',
+				prop: 'query'
 			},
 			{
-                name:'page',
-                prop:'page'
+				name: 'page',
+				prop: 'page'
 			},
 			{
-                name:'sort',
-                prop:'sort'
+				name: 'sort',
+				prop: 'sort'
 			},
 			{
-                name:'srfparentdata',
-                prop:'srfparentdata'
-            }
+				name: 'srfparentdata',
+				prop: 'srfparentdata'
+			},
+            // 工作流使用
+			{
+				name: 'processDefinitionKey',
+				prop: 'processDefinitionKey',
+			},
+			{
+				name: 'userTaskId',
+				prop: 'userTaskId',
+			},
 		];
 	}