Commit Graph
44685 Commits
Author SHA1 Message Date
王怡栋 fabd055dc1 Merge branch 'master_xieqiyu_67693' into 'master'
* Finish task#67693.

See merge request easycorp/zentaopms!5267
2022-09-06 02:52:14 +00:00
xieqiyu 36dc478de5 * Finish task#67693. 2022-09-06 10:21:24 +08:00
wangyidong 19a69c8cae * code for task #67405. 2022-09-06 09:30:22 +08:00
wangyidong 08ad00b091 * fix bug #25049. 2022-09-06 08:54:36 +08:00
孙广明 a321b87f1c Merge branch 'sprint/237_liumengyi_fixbug' into 'master'
* Fix bug #26298, #25695, #27192, #25409, #27020, #23401.

See merge request easycorp/zentaopms!5262
2022-09-06 00:42:27 +00:00
liumengyi 6a2deee711 * Fix bug for task #67727. 2022-09-06 08:39:49 +08:00
liumengyi 83f22d69a2 t pMerge branch 'sprint/237_liumengyi_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/237_liumengyi_fixbug 2022-09-06 08:30:24 +08:00
liumengyi aaa08018f5 * Fix bug #23401. 2022-09-06 08:30:09 +08:00
liumengyi 1451a11129 * Fix bug #67926. 2022-09-06 08:29:05 +08:00
wangyidong 81223fe4c5 * adjust for report workload. 2022-09-05 20:36:01 +08:00
wangyidong 6972110d54 * adjust for delete estimate. 2022-09-05 20:21:18 +08:00
liumengyi 796d0423bc * Fix bug #27020. 2022-09-05 16:30:02 +08:00
wangyidong 303cede555 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-09-05 16:01:46 +08:00
wangyidong 1a0afdd6e0 * fix bug #26541. 2022-09-05 16:01:13 +08:00
王怡栋 d033de2303 Merge branch 'sprint/tianshujie_case' into 'master'
* Add and modify test case of execution module.

See merge request easycorp/zentaopms!5265
2022-09-05 07:46:17 +00:00
王怡栋 7cc59a9177 Merge branch 'sprint/237_tianshujie_bug' into 'master'
Sprint/237 tianshujie bug

See merge request easycorp/zentaopms!5264
2022-09-05 07:45:45 +00:00
tianshujie f15b266dc1 * Add and modify test case of execution module. 2022-09-05 15:43:24 +08:00
liumengyi ed38cf6969 * Fix bug #25409. 2022-09-05 14:31:53 +08:00
tianshujie 1078a4ebc9 * Fix bug #24830. 2022-09-05 14:21:35 +08:00
liumengyi b0a7a8bfd7 * Modify css for task #67925. 2022-09-05 14:07:51 +08:00
wangyidong 1562e2c4a8 * fix bug #26543. 2022-09-05 14:06:56 +08:00
wangyidong c8c544c6d0 * adjust for record estimate. 2022-09-05 13:55:22 +08:00
wangyidong 4f170236c3 * fix bug #27262. 2022-09-05 13:33:56 +08:00
tianshujie dd1feb1a04 * Fix bug #24894. 2022-09-05 13:25:01 +08:00
sunguangming 2f3e8d91ae * Adjust recordestimate style. 2022-09-05 13:20:19 +08:00
liumengyi 0399d05c95 * Fix bug #27192. 2022-09-05 13:12:58 +08:00
liumengyi 5d121bbc01 * Fix bug #25695. 2022-09-05 13:12:36 +08:00
王怡栋 e8478894c4 Merge branch 'master_xieqiyu_test' into 'master'
Master xieqiyu test

See merge request easycorp/zentaopms!5261
2022-09-05 05:10:05 +00:00
王怡栋 0e1038275f Merge branch 'sprint/235_liumengyi_27238' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!5259
2022-09-05 05:09:06 +00:00
王怡栋 9f2a83fa19 Merge branch 'bug_26943' into 'master'
* Fix bug#26943

See merge request easycorp/zentaopms!5258
2022-09-05 05:08:45 +00:00
王怡栋 9ed4f6bdd4 Merge branch 'sprint/hufangzhou_25840' into 'master'
* Fix bug #25840.

See merge request easycorp/zentaopms!5252
2022-09-05 05:08:21 +00:00
tianshujie 9ef6b56e2c * Fix bug #26994. 2022-09-05 13:07:33 +08:00
王怡栋 88a75824f7 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #27198

See merge request easycorp/zentaopms!5251
2022-09-05 05:05:12 +00:00
lanzongjun 499e5f875a add module tree 2022-09-05 11:33:06 +08:00
wangyidong 86ebfc0480 * fix bug #27262. 2022-09-05 11:30:25 +08:00
liumengyi 2bb576415a * Fix bug #26298. 2022-09-05 11:22:12 +08:00
lanzongjun f7922c8c70 * fix bug #27198 2022-09-05 11:03:26 +08:00
tianshujie 28a3491819 * Fix bug #26994. 2022-09-05 11:03:18 +08:00
lanzongjun c4ed80d958 * fix bug #27198 2022-09-05 10:59:46 +08:00
sunguangming bd80adb658 * Code for recordestimate style. 2022-09-05 09:19:10 +08:00
李玉春 beb53a780b Merge branch 'dht_unittest' into 'master'
Add unittest.

See merge request easycorp/zentaopms!5243
2022-09-05 01:02:35 +00:00
denghongtao f2888debdc * Delete getswitcher. 2022-09-05 00:59:44 +00:00
wangyidong cff2453097 * fix bug #26362. 2022-09-05 08:54:26 +08:00
wangyidong c5a129d777 * fix bug #27243. 2022-09-05 08:47:10 +08:00
denghongtao ac86140b61 - Delete notes. 2022-09-05 00:46:00 +00:00
denghongtao ad21b6149c * Fix unittest. 2022-09-05 00:36:23 +00:00
wangyidong 574fd06e71 * adjust for task #67404. 2022-09-05 08:36:17 +08:00
李玉春 2b36876115 Merge branch 'cyy_ops_test' into 'master'
Cyy ops test

See merge request easycorp/zentaopms!5250
2022-09-05 00:30:15 +00:00
朱金勇 da5f72ad2e Merge branch 'sprint/return' into 'master'
* Fix return value declaration error of getFeishuData.

See merge request easycorp/zentaopms!5260
2022-09-05 00:19:14 +00:00
xieqiyu cb55199df4 * Modify the test case of personnel and product. 2022-09-04 16:36:37 +08:00