Commit Graph
56555 Commits
Author SHA1 Message Date
zhaoke 4de63de2e8 Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-05-08 08:51:43 +08:00
liuyue 9f6361f323 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-08 00:35:38 +00:00
liuyue fa3b70e111 * Add return value type of form widget. 2023-05-08 00:35:23 +00:00
wangyidong 7a0d6c435e Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-08 08:34:42 +08:00
wangyidong 6c7930fcb3 * fix bug. 2023-05-08 08:34:19 +08:00
liuchenglong 64502645bc Merge remote-tracking branch 'origin/master' 2023-05-08 00:24:48 +00:00
liuchenglong 773adc0bec * Modify edit programplan. 2023-05-08 00:24:32 +00:00
chentao 281ddb0e4d * product: refactor getProducts function. 2023-05-07 19:59:20 +08:00
chentao e4fac58baf * product: refactor browse function. 2023-05-06 22:05:24 +08:00
zhaoke 3b4d86500a * Modify testDB name. 2023-05-06 18:18:34 +08:00
qishiyao ab2484c493 * Update Makefile for jenkins ci. 2023-05-06 18:14:56 +08:00
wangyidong 44432afa31 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 17:48:35 +08:00
wangyidong 3a6b75fa9e * adjust code for batch edit product. 2023-05-06 17:48:04 +08:00
chaideqing d6ea5e529a Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 17:39:59 +08:00
chaideqing 1226dbaa81 * Revert union test data. 2023-05-06 17:39:55 +08:00
dingyongliang 990079d6f0 + zin: add data group wg. 2023-05-06 17:38:57 +08:00
wangyidong 78c96dde1d Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 17:36:37 +08:00
wangyidong 876ef0b378 * adjust code for batchEdit method. 2023-05-06 17:35:01 +08:00
xushenjie 3e850f1278 * Adjust the todo module's default test data yaml file. 2023-05-06 09:33:04 +00:00
孔令茂 3d48d86665 * Add section comment for block. 2023-05-06 17:30:45 +08:00
chaideqing f4b40f4bc2 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 17:27:52 +08:00
chaideqing b4da961140 * Refactor project function checkPriv. 2023-05-06 17:27:47 +08:00
shenshulong 7b75f7c2d5 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 09:20:19 +00:00
shenshulong 30c35fff5f * Adjusted todo tao yaml file. 2023-05-06 09:20:15 +00:00
dingguodong e424b4dec8 Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-05-06 17:18:02 +08:00
shenshulong 92c0f8d34a + Adjusted todo tao test case. 2023-05-06 09:15:27 +00:00
dingguodong 76eb8fea47 * Fix errors when create programplan. 2023-05-06 17:15:06 +08:00
chentao f60356338b Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-05-06 17:03:43 +08:00
chentao 3eecb83d99 * product: fix access permission. 2023-05-06 17:03:33 +08:00
chaideqing f61522fa38 * Refactor model function getStats4kanban. 2023-05-06 16:49:26 +08:00
dingyongliang 5a09ecb7d7 + zin: add float toolbar wg. 2023-05-06 16:27:51 +08:00
dingguodong 686fe82eca Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-05-06 16:26:46 +08:00
dingguodong ede07ba775 * Refactor programplan::create. 2023-05-06 16:26:27 +08:00
tianshujie f3157df21c * Modify test case for computehours4multiple method. 2023-05-06 16:21:26 +08:00
jukui 978e790951 *Modify getByExportList function todo model. 2023-05-06 16:19:35 +08:00
shenshulong 4836761f6a Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 08:02:02 +00:00
管西迎 80e712a240 Merge pull request 'Merge codecoverage function.' (#32) from lyk_codecoverage into master
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/32
2023-05-06 16:00:48 +08:00
shenshulong bcea16ce21 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 08:00:44 +00:00
tianshujie e258becec8 * Add test case for create task. 2023-05-06 15:59:08 +08:00
liuyongkai 23994447a2 * Show ztf report. 2023-05-06 07:55:42 +00:00
liumengyi 92fe556a76 * Add unit test of taskTao-removeCreateRequiredFields. 2023-05-06 15:54:59 +08:00
liuyongkai 419d889153 * Add get ztf report function. 2023-05-06 07:54:56 +00:00
xushenjie 69d65ca9be * Remove duplicate code after merge. 2023-05-06 07:52:46 +00:00
shenshulong 0cba2a33a0 * Adjusted programplan ajaxGetAttribute function. 2023-05-06 07:51:16 +00:00
xushenjie b640578eba * Added the todoModel::getPriByTodoType() unit test script. 2023-05-06 07:51:07 +00:00
jukui 28032be501 + Add getbyexportlist function test case for todo model. 2023-05-06 15:47:11 +08:00
dingguodong 0af54247c7 * Reformat this file. 2023-05-06 15:45:31 +08:00
dingguodong 645c4f40dd Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-05-06 15:44:19 +08:00
dingguodong e3befe52c6 * Reformat this file. 2023-05-06 15:44:02 +08:00
jukui f403783064 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 15:37:14 +08:00