Merge branch 'master' into 'master_xieqiyu_67691'

# Conflicts: # db/update17.6.sql
2022-09-08 01:38:22 +00:00
parent 592a109bed bfe6177f3f
commit 84da5dced1
14 changed files with 178 additions and 76 deletions
@@ -7308,7 +7308,7 @@ class upgradeModel extends model

                $this->dao->insert(TABLE_TASKTEAM)->data($oldTeam)->exec();

-                $this->dao->update(TABLE_TASKESTIMATE)->set('`order`')->eq($order)->where('task')->($oldTeam->task)->andWhere('account')->eq($oldTeam->account)->exec();
+                $this->dao->update(TABLE_TASKESTIMATE)->set('`order`')->eq($order)->where('task')->eq($oldTeam->task)->andWhere('account')->eq($oldTeam->account)->exec();
                $this->dao->update(TABLE_EFFORT)->set('`order`')->eq($order)->where('objectType')->eq('task')->andWhere('objectID')->eq($oldTeam->task)->andWhere('account')->eq($oldTeam->account)->exec();
                $order ++;
            }