Commit Graph
55724 Commits
Author SHA1 Message Date
shenshulong cf8be17925 - Conflict resolution todo model 2023-04-28 03:06:54 +00:00
shenshulong a2bd953cd6 Adjusted todo start and activate function. 2023-04-28 03:02:47 +00:00
xushenjie 14bfad8b68 * Adjust field idvalue in method todoZen::beforeCreate() to objectID. 2023-04-28 02:51:45 +00:00
xushenjie 2c9b40a486 * Adjust the order of method description comments. 2023-04-28 02:29:27 +00:00
xushenjie d536ac3311 * Adjust the split logic of TODO's create() method. 2023-04-28 02:25:54 +00:00
zhouxin bc03202739 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-28 02:16:23 +00:00
zhouxin a47617863b * Refactor updateTaskEsDateByGantt method and move it to tao. 2023-04-28 02:15:36 +00:00
陈涛 498f70d22d * product: fix return type. 2023-04-28 10:15:11 +08:00
jukui 87417382bb Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-28 10:01:04 +08:00
Wangyuting a78034cd9f * Adjust block form css. 2023-04-28 09:55:51 +08:00
jukui 427313f224 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-28 09:52:14 +08:00
jukui 9da97821f6 * Modify view and editDate function todo. 2023-04-28 09:52:02 +08:00
Wangyuting 5e43687414 * Fix block dashboard bug. 2023-04-28 09:49:05 +08:00
Wangyuting ac0c5b9aae * Adjust block table block field to code field. 2023-04-28 09:46:01 +08:00
lanzongjun ff772ca202 + Add access header. 2023-04-28 09:43:10 +08:00
weizhenlong 8688c8b294 add incremental commit scan logic back 2023-04-28 09:38:30 +08:00
weizhenlong 7e0a10c77f add sonar.projectversion parameter 2023-04-28 09:17:43 +08:00
sunguangming 8a3fb0ae19 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-28 08:50:07 +08:00
sunguangming 7940320bff * Reactor project-create view. 2023-04-28 08:49:47 +08:00
caoyanyi 63f34dcf03 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-28 08:48:31 +08:00
caoyanyi c40a862a88 * Modify param type. 2023-04-28 08:48:14 +08:00
wangyidong 61157ac515 * adjust for product construct function. 2023-04-28 08:43:17 +08:00
wangyidong 89f5120652 * code for product create page. 2023-04-28 08:23:49 +08:00
unknown 1776e5c681 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-27 21:05:07 +08:00
unknown 3c83dd456c Remove the incremental analysis shell code in jenkinsfile 2023-04-27 21:04:44 +08:00
Wangyuting 0f09e93911 * Fix block bug in determining type. 2023-04-27 21:02:30 +08:00
Wangyuting cc8b0ea15d * Optimize block edit code. 2023-04-27 20:50:51 +08:00
shenshulong 2031eec91e Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-27 12:23:09 +00:00
shenshulong f914a26937 * Perfect start and activate test case. 2023-04-27 12:22:45 +00:00
dingguodong 0eb62e673a Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-04-27 20:07:14 +08:00
dingguodong 4ab7f4c3f5 * Format UTC for close todo. 2023-04-27 20:06:51 +08:00
lanzongjun 91177b69b8 * Modify create todo load model. 2023-04-27 20:02:22 +08:00
lanzongjun 59fba9ba81 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-27 19:53:02 +08:00
lanzongjun 3804931628 * Modify idvalue to objectID. 2023-04-27 19:52:55 +08:00
dingguodong 2a286c67f0 Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-04-27 19:52:31 +08:00
dingguodong fd072bd044 * Refactor batch close todos. 2023-04-27 19:50:20 +08:00
孔令茂 c0e56354ab + Add getmydashboard unit test for block module. 2023-04-27 19:46:11 +08:00
Fantaser 8197b36b3e Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-27 19:30:29 +08:00
Fantaser 43d3e3d1be * Split the logic for todoController::create() and todoModel::createByCycle(). 2023-04-27 19:30:16 +08:00
sunguangming 434572eefd Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-27 19:29:24 +08:00
sunguangming e6586c84a2 * Refactor project-create method. 2023-04-27 19:29:00 +08:00
Fantaser c9ac6d2b82 * The logic of split todoModel::create () to the tao. 2023-04-27 19:25:28 +08:00
Fantaser 86374bb50b * Remove function of todoZen::beforeCreate(). 2023-04-27 19:22:45 +08:00
liuruogu d94b7ebb23 * Modify sql of update. 2023-04-27 19:18:38 +08:00
shenshulong d21ea8ee42 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-27 11:17:17 +00:00
shenshulong dbc66430c0 * Adjusted todo activate function. 2023-04-27 11:17:00 +00:00
zenggang 8979e405cd * Assignto method 2023-04-27 11:16:51 +00:00
chaideqing 0212378866 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-27 19:15:04 +08:00
chaideqing 7b39fba095 - Reveme debug info. 2023-04-27 19:14:58 +08:00
liumengyi d0faa75370 * Add comment of task-fetchExecutionTasks task-computeCurrentTaskStatus task-computeHours4Multiple unit test. 2023-04-27 19:11:35 +08:00