Commit Graph
26670 Commits
Author SHA1 Message Date
songchenxuan 65e41ae440 *Finish task #46095. 2021-12-20 18:13:23 +08:00
songchenxuan ca1230076f *Finish task #46095. 2021-12-20 18:10:40 +08:00
songchenxuan 1bbb985b3e *Finish task #46095. 2021-12-20 13:44:41 +08:00
李玉春 43d07b8cd0 Merge branch 'sgm_projectpriv' into 'master'
* Reset project priv.

See merge request easycorp/zentaopms!979
2021-12-17 03:03:39 +00:00
zhujinyong de2e4be174 * Fix test. 2021-12-17 10:23:57 +08:00
孙广明 6ee1345b07 * Reset project priv. 2021-12-17 10:13:49 +08:00
李玉春 898f65f84b Merge branch 'sgm_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!956
2021-12-15 07:45:07 +00:00
tanghucheng 8409760490 * Fix bug #17565. 2021-12-15 14:55:04 +08:00
孙广明 04eb385659 * Fix bug. 2021-12-15 14:34:52 +08:00
朱金勇 eba28ffa85 Merge branch 'sprint/176_songchenxuan_45535' into 'master'
*Fix task #45535 bug.

See merge request easycorp/zentaopms!944
2021-12-15 00:40:22 +00:00
朱金勇 b3b60dd4e4 Merge branch 'sprint/176_songchenxuan_45545' into 'master'
*Fix task #45545 bug.

See merge request easycorp/zentaopms!941
2021-12-15 00:39:56 +00:00
songchenxuan 8a014b58f4 *Fix task #45535 bug. 2021-12-15 08:37:31 +08:00
songchenxuan 731c7fb45c *Fix task #45545 bug. 2021-12-14 17:33:01 +08:00
朱金勇 328379d956 Merge branch 'sprint/176_xieqiyu_17516' into 'master'
* Fix bug#17516.

See merge request easycorp/zentaopms!939
2021-12-14 09:12:47 +00:00
孙广明 2be30ab738 Merge branch 'sprint/liyuchun_bug' into 'master'
* Fix bug #17521.

See merge request easycorp/zentaopms!938
2021-12-14 09:10:53 +00:00
xieqiyu fde47bebb6 * Fix bug#17516. 2021-12-14 16:56:59 +08:00
liyuchun df21c2f8bf * Fix bug #17521. 2021-12-14 16:56:40 +08:00
朱金勇 7a7dd0d6c3 Merge branch 'sprint/176_xieqiyu_17503' into 'master'
* Fix bug#17503.

See merge request easycorp/zentaopms!931
2021-12-14 07:49:20 +00:00
xieqiyu a978d41365 * Code for bug#17503. 2021-12-14 15:47:19 +08:00
朱金勇 d5d4cfe049 Merge branch 'sprint/176_mayue_45544' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!936
2021-12-14 07:43:32 +00:00
朱金勇 e683c32d25 Merge branch 'sprint/177_sunhao/use_rings' into 'master'
* Refactor progress-pie instead of rings to improve perf.

See merge request easycorp/zentaopms!932
2021-12-14 07:40:58 +00:00
Hao Sun 2f862118d8 * Refactor progress-pie instead of rings to improve perf. 2021-12-14 14:31:41 +08:00
xieqiyu ed9eedf543 * Fix bug#17503. 2021-12-14 14:27:26 +08:00
李玉春 7f098934f8 Merge branch 'devops_mr_unit' into 'master'
* Add mr create unit test and adjust code

See merge request easycorp/zentaopms!919
2021-12-14 06:10:24 +00:00
mayue 7deea0d588 * Optimize code. 2021-12-14 13:42:54 +08:00
朱金勇 efdadc07a7 Merge branch 'sprint/176_mayue_45544' into 'master'
* Finish a task #45544.

See merge request easycorp/zentaopms!928
2021-12-14 05:34:42 +00:00
mayue 35a7df0974 * Optimize code. 2021-12-14 11:02:15 +08:00
mayue ccf82f6226 * Modify annotation. 2021-12-14 10:18:35 +08:00
朱金勇 a14138be45 Merge branch 'sprint/176_xieqiyu_17472' into 'master'
* Fix bug#17472.

See merge request easycorp/zentaopms!921
2021-12-14 01:54:13 +00:00
mayue 77d36b7467 * Finish a task #45544. 2021-12-14 09:49:46 +08:00
朱金勇 26dc3e847d Merge branch 'sprint/176_xieqiyu_17469' into 'master'
* Fix bug#17469.

See merge request easycorp/zentaopms!918
2021-12-14 01:48:56 +00:00
李玉春 fb6f913229 Merge branch 'sprint/devops16_wangyidong_test' into 'master'
* code for bug #17445.

See merge request easycorp/zentaopms!920
2021-12-14 01:47:24 +00:00
王怡栋 1bc35c32c4 * code for task #17444. 2021-12-14 09:13:50 +08:00
zhujinyong 45cdfc8f59 Merge branch 'xuan' 2021-12-14 09:08:15 +08:00
xieqiyu 559ce03369 * Fix bug#17472. 2021-12-14 08:57:10 +08:00
王怡栋 98a46445b3 * code for bug #17445. 2021-12-13 17:24:52 +08:00
zenggang a34c753438 * Add mr create unit test and adjust code 2021-12-13 09:08:00 +00:00
xieqiyu 6829d52cde * Fix bug#17469. 2021-12-13 16:57:25 +08:00
李玉春 47c4b4e526 Merge branch 'sprint/devops16_wangyidong_test' into 'master'
* code for bug #17438.

See merge request easycorp/zentaopms!915
2021-12-13 08:10:11 +00:00
王怡栋 eadbb0e1de * adjust code. 2021-12-13 16:09:40 +08:00
王怡栋 69023a52bc * code for bug #17438. 2021-12-13 15:24:04 +08:00
liyuchun acc03bdcfe * Fix bug #17439. 2021-12-13 14:40:43 +08:00
liyuchun 56d849cf0a * Fix bug #17439. 2021-12-13 14:28:19 +08:00
朱金勇 78e51a5900 Merge branch 'sprint/176_songchenxuan_45535' into 'master'
*Finish task #45535.

See merge request easycorp/zentaopms!911
2021-12-13 05:54:19 +00:00
songchenxuan 53e4b2d102 *Finish task #45535. 2021-12-13 13:53:03 +08:00
李玉春 fd6cc79ea0 Merge branch 'sprint/devops16_17391' into 'master'
* Fix bug#17391

See merge request easycorp/zentaopms!907
2021-12-13 05:51:46 +00:00
liyuchun 1e60836c3e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-13 12:12:46 +08:00
朱金勇 ea39b28199 Merge branch 'sprint/176_songchenxuan_45543' into 'master'
*Finish task #45543.

See merge request easycorp/zentaopms!909
2021-12-13 05:10:02 +00:00
朱金勇 58fb407b19 Merge branch 'sprint/176_songchenxuan_45535' into 'master'
*Finish task #45535.

See merge request easycorp/zentaopms!908
2021-12-13 05:01:45 +00:00
liyuchun 4ecc85aa0e Merge branch 'devops16' 2021-12-13 12:12:37 +08:00