From 768fc78700b42995cce49156973e35293cf89814 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期三, 09 八月 2023 09:55:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/work/todo.vue |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/work/todo.vue b/Source/UBCS-WEB/src/views/work/todo.vue
index bff6aab..35f7281 100644
--- a/Source/UBCS-WEB/src/views/work/todo.vue
+++ b/Source/UBCS-WEB/src/views/work/todo.vue
@@ -5,6 +5,7 @@
       :data="data"
       ref="crud"
       v-model="form"
+      :page.sync="page"
       @search-change="searchChange"
       @search-reset="searchReset"
       @selection-change="selectionChange"
@@ -105,7 +106,7 @@
             label: '鍙戣捣鏃堕棿',
             sortable:true,
             width:180,
-            prop: 'createTime',
+            prop: 'processDefinitionStartTime'
           }, {
             label: '鎵�灞炴祦绋嬫ā鏉�',
             sortable:true,

--
Gitblit v1.9.3