Commit Graph
1383 Commits
Author SHA1 Message Date
王怡栋 351b8f37f5 Merge branch 'sprint/221_liumengyi_fixbug' into 'master'
* Fix bug #25978, #25968, #26020.

See merge request easycorp/zentaopms!4814
2022-08-05 02:51:24 +00:00
liumengyi b43a153974 * Fix bug #25978. 2022-08-05 10:39:33 +08:00
liumengyi 4244b98ec1 * Fix issue #714. 2022-08-05 10:37:33 +08:00
liumengyi 24a5917b4a * Fix issue #714. 2022-08-05 10:08:28 +08:00
王怡栋 2a03c9bfe3 Merge branch 'sprint/221_liumengyi_63455' into 'master'
* Finish task #63455.

See merge request easycorp/zentaopms!4797
2022-08-04 06:21:37 +00:00
liumengyi 02a3c130c0 * Fix bug for task #63455. 2022-08-04 13:37:17 +08:00
王怡栋 eceac71915 Merge branch 'master_liuhong_25078' into 'master'
*Fix bug #25078

See merge request easycorp/zentaopms!4762
2022-08-04 02:01:25 +00:00
liuhong 3c0471a280 *Fix bug #25078*Fix bug #25078*Fix bug #25078*Fix bug #25078*Fix bug 2022-08-04 01:28:19 +00:00
wangyidong f5b6edef01 Merge branch 'sprint/devplat_30' 2022-08-04 09:13:53 +08:00
liuhong 892cb2e6dc *Fix bug #25078 2022-08-04 00:18:17 +00:00
liuruogu a28d225da9 * Finish task #63381. 2022-08-03 08:21:44 +00:00
liuhong 49ff270d97 *Fix bug #25078 2022-08-03 06:53:36 +00:00
wangyuting2 84c6278274 * Finish task #63288. 2022-08-03 13:32:41 +08:00
liumengyi 8c1c84b430 * Fix bug #25968. 2022-08-03 11:24:36 +08:00
liumengyi 1da72a9ac7 * Fix bug for task #62945. 2022-08-03 09:07:27 +08:00
daitingting b834dc794f * Finish task #62919,#62923,#62924. 2022-08-02 07:43:12 +00:00
liumengyi ed5468e621 * Finish task #62945. 2022-08-01 15:54:18 +08:00
zenggang 4bd33b9cba * Adjust code 2022-07-27 01:53:26 +00:00
zenggang 7973da34a6 * Finish task#61964 2022-07-26 06:03:35 +00:00
zhouxudong 1e1ce39096 * Fix bug #24736 #24738 #24745 #24748 #24844 #24849. 2022-07-06 06:18:09 +00:00
zhouxudong 60ddcc7894 * Finish task #59518 #59522. 2022-07-05 05:49:04 +00:00
zhouxudong 0b309f63bd * Finish task #59534 #59530 #59529. 2022-07-04 08:54:44 +00:00
liumengyi 16e0011b79 * Fix bug #24651. 2022-07-01 09:43:22 +08:00
tianshujie 5a7778acbe * Fixed TAB return error. 2022-06-30 13:37:34 +08:00
liumengyi 6e107a4783 * Fix bug #24288. 2022-06-30 13:15:03 +08:00
liumengyi 03b07a3b3a * Fix bug #24288. 2022-06-30 11:23:46 +08:00
liumengyi fe4aa6c00f * Fix bug #24288. 2022-06-30 11:21:38 +08:00
tianshujie 32af972947 * Fix bug #24533. 2022-06-29 15:25:38 +08:00
tianshujie 3c31a80784 * To remove a null value. 2022-06-29 14:35:31 +08:00
tianshujie 1f185ff189 * Fix bug #24514. 2022-06-29 14:34:09 +08:00
王怡栋 19f69fa354 Merge branch 'sprint/208_liumengyi_686' into 'master'
* Fix issue #686.

See merge request easycorp/zentaopms!4208
2022-06-29 05:35:33 +00:00
liumengyi 6669ccb37a * Fix issue #686. 2022-06-29 13:34:09 +08:00
sunjun d0bfee6d69 fixbug_24438 2022-06-29 05:11:49 +00:00
tianshujie 1592cefab6 * Fix bug #24391. 2022-06-29 10:40:44 +08:00
王怡栋 d642a4238b Merge branch 'sprint/208_tianshujie_58552' into 'master'
Sprint/208 tianshujie 58552

See merge request easycorp/zentaopms!4187
2022-06-28 06:30:45 +00:00
tianshujie f994051ea8 * Finish task #58552. 2022-06-28 12:16:11 +08:00
tianshujie 319d29e3d3 * Finish task #58552. 2022-06-28 09:06:38 +08:00
tianshujie 70b01098ac * Finish task #58552. 2022-06-27 17:22:49 +08:00
leiyong a2fe525436 * Finish task#58598. 2022-06-27 08:49:35 +00:00
xieqiyu d4ac1b4a5f * Code for task#57850. 2022-06-23 17:20:19 +08:00
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.

See merge request easycorp/zentaopms!4083
2022-06-23 00:39:25 +00:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
zhujinyong c2bff85082 * Fix fail of ciresult. 2022-06-20 08:50:47 +08:00
孙广明 f09c614299 * Add comment. 2022-06-14 09:25:04 +08:00
孙广明 7c7a364102 * Finish task #56635. 2022-06-13 14:28:57 +08:00
孙广明 753a5e557a * Finish task #56635. 2022-06-13 11:11:01 +08:00
wangyidong 11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00