Commit Graph
55757 Commits
Author SHA1 Message Date
wangyidong 6e2c3c4124 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-28 13:30:28 +08:00
wangyidong 906252bb00 * adjust for product getpairs. 2023-04-28 13:28:16 +08:00
Chenjianyu 1394790bac * Fix the missing param. 2023-04-28 13:22:50 +08:00
liuruogu 95706ca146 * Modify block config. 2023-04-28 13:22:06 +08:00
liyang 4e9be20662 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-28 13:11:30 +08:00
liyang ba2f7bd504 + Add config yaml file for generate the data. 2023-04-28 13:10:21 +08:00
liuyue 8364769076 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-28 05:04:09 +00:00
liuyue aa5c6cf7fa * Refactoring assign to page for todo. 2023-04-28 05:03:59 +00:00
Chenjianyu 00ccac0d0e * Refactor block control dashboard function. 2023-04-28 13:02:16 +08:00
liuhong c1375ea72f * Split closed methods into Zen and Tao layers and output unit tests 2023-04-28 12:26:51 +08:00
陈涛 7e435fc3b2 * product: fix business logic of getLinePairs function. 2023-04-28 12:22:48 +08:00
tianshujie 7bbe01e280 * Modify the unit test case of the task module. 2023-04-28 12:17:45 +08:00
liuchenglong 58c83f7777 * Resolve conflict. 2023-04-28 03:34:09 +00:00
liuchenglong fa9478c265 * Split todo-assignto,todo-delete,todo-finish,todo-batchfinish. 2023-04-28 03:27:00 +00:00
liuchenglong 0c935d0b27 * Resolve conflict. 2023-04-28 03:24:44 +00:00
lanzongjun f076cedc39 * Edit todo add int type. 2023-04-28 11:24:04 +08:00
tianshujie 6500d6cdf5 * Refactor function logic. 2023-04-28 11:20:28 +08:00
dingguodong e600817b8c Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-04-28 11:16:23 +08:00
dingguodong 96cb837f86 * Resolve issue reported by sonar scanner. 2023-04-28 11:15:33 +08:00
dingyongliang 3208030de1 * convert [] to array(). 2023-04-28 11:15:29 +08:00
caoyanyi bc62a6286d Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-28 11:14:38 +08:00
caoyanyi 38ce81a407 * Modify error process. 2023-04-28 11:14:23 +08:00
孔令茂 9fc075940d * Optimize unit test for block. 2023-04-28 11:12:27 +08:00
綦新志 c68fb05b59 Merge pull request 'sprint/scx_bug_create_setmenu' (#22) from sprint/scx_bug_create_setmenu into master
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/22
2023-04-28 11:11:02 +08:00
caoyanyi 5fd487edd8 * Add exception process. 2023-04-28 11:09:40 +08:00
songchenxuan 3995c7a7c0 * Add 。. 2023-04-28 11:08:11 +08:00
xushenjie 37383aa4b6 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-28 03:07:27 +00:00
xushenjie 61d0f3dd67 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-28 03:07:15 +00:00
shenshulong cf8be17925 - Conflict resolution todo model 2023-04-28 03:06:54 +00:00
xushenjie 509c504a49 * Adjust todoTao::getCycleTodoDate () parameter types. 2023-04-28 03:06:52 +00:00
songchenxuan f860d01cd6 * Add return type. 2023-04-28 11:06:10 +08:00
shenshulong a2bd953cd6 Adjusted todo start and activate function. 2023-04-28 03:02:47 +00:00
songchenxuan fe23fa416a * Add create test case. 2023-04-28 10:58:23 +08: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
songchenxuan a0aab68369 * Move code to top. 2023-04-28 09:31:19 +08:00
songchenxuan 78d3b1a342 * Add a new func. 2023-04-28 09:27:34 +08:00
weizhenlong 7e0a10c77f add sonar.projectversion parameter 2023-04-28 09:17:43 +08:00