Commit Graph
39945 Commits
Author SHA1 Message Date
孙广明 ea2fe3e532 Merge branch 'sprint200_leiyong_task_56378' into 'sprint_200'
Sprint200 leiyong task 56378

See merge request easycorp/zentaopms!3801
2022-06-09 02:40:35 +00:00
leiyong b471a3cdad * Adjust code. 2022-06-09 02:36:56 +00:00
王怡栋 4591b20bd7 Merge branch 'sprint/200-zhouxudong_56383' into 'sprint_200'
Sprint/200 zhouxudong 56383

See merge request easycorp/zentaopms!3809
2022-06-09 01:57:00 +00:00
zhouxudong f7c784d6fa * Finish task #56383. 2022-06-09 01:10:38 +00:00
zhouxudong 9694af1c79 * Finish task #56383. 2022-06-09 00:52:00 +00:00
leiyong ce0dbc7d91 * Finish task#56373. 2022-06-08 10:53:01 +00:00
zhouxudong 6265fcd76f * Finish task #56383. 2022-06-08 09:37:10 +00:00
王怡栋 8ca5452ac8 Merge branch 'sprint200_leiyong_task_56360' into 'sprint_200'
* Finish task#56360.

See merge request easycorp/zentaopms!3774
2022-06-08 08:58:33 +00:00
leiyong 513b62abb0 * Adjust code. 2022-06-08 08:50:09 +00:00
leiyong 2a8339de04 * Finish task#56375. 2022-06-08 08:45:58 +00:00
王怡栋 7f967e8091 Merge branch 'sprint200_leiyong_task_56367' into 'sprint_200'
Sprint200 leiyong task 56367

See merge request easycorp/zentaopms!3795
2022-06-08 08:45:55 +00:00
leiyong 1f109a15aa * Finish task#56378. 2022-06-08 08:18:50 +00:00
zhouxudong 0dc3a87d2e * Finish task #56383 2022-06-08 08:02:47 +00:00
朱金勇 fbab734791 Merge branch 'sprint/200_sunhao/task56369' into 'sprint_200'
* task #56369, optimize btn style in kanban header.

See merge request easycorp/zentaopms!3784
2022-06-08 07:53:22 +00:00
孙广明 20532c7756 Merge branch 'sprint/200_zhouxudong_56381' into 'sprint_200'
* Finish task #56381.

See merge request easycorp/zentaopms!3778
2022-06-08 07:52:54 +00:00
孙广明 a3cf2ab2b4 Merge branch 'sprint200_leiyong_task_56387' into 'sprint_200'
* Finish task#56387.

See merge request easycorp/zentaopms!3775
2022-06-08 07:44:47 +00:00
leiyong 49604b2248 * Adjust code. 2022-06-08 07:10:02 +00:00
zhouxudong 512f152a6b * Finish task #56381. 2022-06-08 06:48:34 +00:00
zhouxudong afbda967c1 * Finisha task #56381. 2022-06-08 06:43:38 +00:00
孙广明 0c0af6336a Merge branch 'sprint/master_zhouxudong_23026' into 'sprint_200'
Sprint/master zhouxudong 23026

See merge request easycorp/zentaopms!3777
2022-06-08 06:37:32 +00:00
zhouxudong 0586ef58e6 * Finishs task #56381. 2022-06-08 06:32:34 +00:00
zhouxudong edd66c028d * Fix bug #23026. 2022-06-08 06:25:06 +00:00
孙广明 e5fd2a3684 Merge branch 'sprint/200_sunhao/task56385' into 'sprint_200'
* task #56385, update theme 'blue', optimize active button style.

See merge request easycorp/zentaopms!3787
2022-06-08 06:22:02 +00:00
Hao Sun 35f6fb79c8 * task #56385, update theme 'blue', optimize active button style. 2022-06-08 05:40:28 +00:00
leiyong da49166f81 * Adjust CSS. 2022-06-08 05:40:18 +00:00
leiyong 23368e7847 * Adjust style. 2022-06-08 05:26:45 +00:00
leiyong 6ed6c4a956 * Adjust style. 2022-06-08 05:16:22 +00:00
zhouxudong 596ea0124b * Finish task #56383. 2022-06-08 05:01:16 +00:00
王怡栋 e459b851d5 Merge branch 'sprint_200_xieqiyu_56388' into 'sprint_200'
* Finish task#56388.

See merge request easycorp/zentaopms!3783
2022-06-08 05:00:06 +00:00
Hao Sun 7285ae4cf8 * task #56369, optimize btn style in kanban header. 2022-06-08 03:28:59 +00:00
xieqiyu bb574373b4 * Finish task#56388. 2022-06-08 11:27:23 +08:00
leiyong 5a0cd1562b * Finish task#56371. 2022-06-08 03:20:36 +00:00
王怡栋 12b52e4687 Merge branch 'sprint_200_xieqiyu_56390' into 'sprint_200'
* Code for task#56393,#56390,#56389.

See merge request easycorp/zentaopms!3780
2022-06-08 02:44:45 +00:00
leiyong 1086eca0db * Finish task#56367. 2022-06-08 02:44:31 +00:00
xieqiyu 86561ba4ca * Code for task#56393,#56390,#56389. 2022-06-08 10:15:01 +08:00
leiyong 6ba36fc282 * Finish task#56387. 2022-06-07 08:16:56 +00:00
leiyong bb31bbdca2 * Finish task#56360. 2022-06-07 07:55:58 +00:00
孙广明 e26d40da04 Merge branch 'sprint/200_zhouxudong_56363' into 'sprint_200'
* Finish task #56363.

See merge request easycorp/zentaopms!3771
2022-06-07 07:22:15 +00:00
zhouxudong 687f29b7bc * Finish task #56363. 2022-06-07 06:44:49 +00:00
zhouxudong d89952846b * Finish task #56381. 2022-06-07 06:32:08 +00:00
zhouxudong 607a871ddf * Finish task #56396. 2022-06-07 06:09:44 +00:00
zhouxudong 1a952376fe * Finish task #56396. 2022-06-07 05:44:06 +00:00
zhouxudong 0f645a096e * Finish task #56396. 2022-06-07 05:39:44 +00:00
李玉春 6a1f0a9562 Merge branch 'sprint/fixbug_liumengyi_23340' into 'master'
* Fix bug #23340.

See merge request easycorp/zentaopms!3762
2022-06-07 05:28:37 +00:00
王怡栋 444b00343f Merge branch 'master_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!3766
2022-06-07 04:13:02 +00:00
tanghucheng 0e24f99f82 * Fix bug for lite. 2022-06-07 12:10:33 +08:00
tanghucheng 97b6196b91 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-07 11:35:20 +08:00
liumengyi 6e4ac95a48 * Fix bug #23340. 2022-06-07 10:35:13 +08:00
李玉春 cf20ee9361 Merge branch 'sprint/tianshujie_23258' into 'master'
* Fix bug #23258.

See merge request easycorp/zentaopms!3761
2022-06-07 01:47:07 +00:00
tianshujie 3033d3e567 * Fix bug #23258. 2022-06-07 09:42:05 +08:00