Commit Graph
44065 Commits
Author SHA1 Message Date
tianshujie a63dd2500f * Modify name beyond hidden style. 2022-08-24 08:55:16 +08:00
王怡栋 0036bac572 Merge branch 'master_liuhong_26000' into 'master'
*Fix bug #26000.

See merge request easycorp/zentaopms!5047
2022-08-24 00:46:46 +00:00
liuhong 329238d8cd *Fix bug #26000. 2022-08-23 09:23:09 +00:00
孙广明 c7090f6892 Merge branch 'sprint/231_liumengyi_fixbug' into 'master'
* Correct the translation.

See merge request easycorp/zentaopms!5071
2022-08-23 09:18:57 +00:00
liumengyi 6f187e3a23 * Correct the translation. 2022-08-23 17:16:49 +08:00
李玉春 3e487df2b3 Merge branch 'sprint/231_tianshujie_65808' into 'master'
* Finish task #65808, #65807.

See merge request easycorp/zentaopms!5067
2022-08-23 08:26:36 +00:00
liumengyi 277ee237d9 * Optimize code for task #65808, #65807. 2022-08-23 16:25:38 +08:00
王怡栋 f814ff44fa Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #65904

See merge request easycorp/zentaopms!5069
2022-08-23 08:25:06 +00:00
liumengyi c95ecbd1a6 * Optimize code for task #65808. 2022-08-23 16:19:20 +08:00
tianshujie 3a99afd287 * Finish task #65808,65807. 2022-08-23 16:12:52 +08:00
lanzongjun a658491395 * fix bug #65904 2022-08-23 15:57:06 +08:00
liumengyi 06c64d7e6f * Optimize code for task #65808, #65807. 2022-08-23 15:48:47 +08:00
tianshujie 44d270da18 * Finish task #65808. 2022-08-23 15:48:20 +08:00
tianshujie fda29bc600 Merge branch 'sprint/231_tianshujie_65808' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/231_tianshujie_65808 2022-08-23 15:40:43 +08:00
tianshujie 15eface39c * Finish task #65808. 2022-08-23 15:40:29 +08:00
孙广明 cae4f4b2c7 Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of update story datetable.

See merge request easycorp/zentaopms!5064
2022-08-23 07:28:19 +00:00
孙广明 ff0560288d Merge branch 'sprint/max43_mayue_bug#26655' into 'master'
* Fix bug #26655.

See merge request easycorp/zentaopms!5066
2022-08-23 07:28:05 +00:00
xieqiyu 1590364db3 * Fix bug of link story. 2022-08-23 15:23:17 +08:00
liumengyi fb98e38d42 * Optimize code for task #65807. 2022-08-23 15:03:41 +08:00
tianshujie 5cfc47639a Merge branch 'sprint/231_tianshujie_65808' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/231_tianshujie_65808 2022-08-23 15:03:29 +08:00
tianshujie dca2784559 * Finish task #65808. 2022-08-23 15:02:57 +08:00
liumengyi b016635bd8 * Fix bug for task #65807. 2022-08-23 14:53:24 +08:00
liumengyi 545d74f7d0 * Optimize code for task #65808, #65807. 2022-08-23 14:50:40 +08:00
tianshujie 976de6e849 * Fix the problem of error reporting in the contribution task list. 2022-08-23 14:17:43 +08:00
mayue e98b4939c7 * Fix bug #26655. 2022-08-23 14:15:12 +08:00
liumengyi cc92f9d3ef * Optimize code. 2022-08-23 13:54:29 +08:00
liumengyi 617122882a * Finish task #65807. 2022-08-23 13:45:44 +08:00
tianshujie 4e1ca8bd60 * Finish task #65808. 2022-08-23 13:40:34 +08:00
孙广明 7b4002c1d1 Merge branch 'sprint/max43_mayue_bug#26200' into 'master'
* Fix bug #26200.

See merge request easycorp/zentaopms!5058
2022-08-23 03:02:25 +00:00
mayue 6336e232fb * Optimize code. 2022-08-23 11:01:31 +08:00
xieqiyu bd510fe0d4 * Fix bug of update story datetable. 2022-08-23 10:11:31 +08:00
王怡栋 b1516dbc92 Merge branch 'importExport' into 'master'
* Fix bug #65908.

See merge request easycorp/zentaopms!5063
2022-08-23 01:58:31 +00:00
王怡栋 23c4b63452 Merge branch 'sprint/max43_mayue_bug#26054#26057' into 'master'
* Fix bug #26054#26057.

See merge request easycorp/zentaopms!5062
2022-08-23 01:57:51 +00:00
王怡栋 5c3a2b5ddc Merge branch 'sprint/hufangzhou_26743' into 'master'
* Fix bug #26743. And modify the unit case of batch edit under the execution module.

See merge request easycorp/zentaopms!5056
2022-08-23 01:55:40 +00:00
王怡栋 115d740063 Merge branch 'master_liuhong_64879' into 'master'
0timization task #64879.

See merge request easycorp/zentaopms!5055
2022-08-23 01:55:13 +00:00
王怡栋 c259250003 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #65923

See merge request easycorp/zentaopms!5054
2022-08-23 01:54:36 +00:00
王怡栋 216d310dd1 Merge branch 'release_zg_fix' into 'master'
* Fix release email bug

See merge request easycorp/zentaopms!5048
2022-08-23 01:52:45 +00:00
王怡栋 b688c564f5 Merge branch 'sprint/master_zhouxudong_66231' into 'master'
* Finish task #66231.

See merge request easycorp/zentaopms!5061
2022-08-23 01:50:26 +00:00
王怡栋 2a49655e2d Merge branch 'sprint/master_zhouxudong_update64888' into 'master'
* Optimization task #64888.

See merge request easycorp/zentaopms!5037
2022-08-23 01:49:31 +00:00
mayue 2f2f0e6542 * Optimize code. 2022-08-23 09:33:45 +08:00
tanghucheng b9d031bda1 * Fix bug #65908. 2022-08-23 09:27:56 +08:00
mayue bf9a6e4da8 * Fix bug #26054#26057. 2022-08-23 09:07:45 +08:00
lanzongjun 1027078838 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-08-23 08:48:08 +08:00
sunguangming 7fe8456f4f * Code for build locate bug. 2022-08-23 08:33:17 +08:00
孙广明 dff37692d9 Merge branch 'sprint/231_liumengyi_65780' into 'master'
* Finish task #65780.

See merge request easycorp/zentaopms!5057
2022-08-23 00:12:26 +00:00
孙广明 c9ae2bfcb6 Merge branch 'master_xieqiyu_draftStory' into 'master'
Master xieqiyu draft story

See merge request easycorp/zentaopms!5060
2022-08-23 00:11:31 +00:00
xieqiyu 40771942f7 Merge remote-tracking branch 'origin' into master_xieqiyu_draftStory 2022-08-22 17:47:50 +08:00
xieqiyu 64b9c8d35e * Delete unused code. 2022-08-22 17:41:29 +08:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
孙广明 eda772428a Merge branch 'sprint/max43_mayue_bug#26638' into 'master'
Sprint/max43 mayue bug#26638

See merge request easycorp/zentaopms!5051
2022-08-22 09:11:01 +00:00