Commit Graph
35044 Commits
Author SHA1 Message Date
tianshujie cac6216a09 * Finish task #61967. 2022-07-26 10:50:16 +08:00
tianshujie 52dccd78bc Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/220_tianshujie_61965 2022-07-26 10:49:03 +08:00
王怡栋 6ca980c93c Merge branch 'sprint/220_tianshujie_navigation' into 'master'
Sprint/220 tianshujie navigation

See merge request easycorp/zentaopms!4654
2022-07-26 02:46:19 +00:00
tianshujie 807c168fa9 * Finish task #61967. 2022-07-26 10:38:11 +08:00
王怡栋 2f742dbaab Merge branch 'sprint/master_zhouxudong_61906' into 'master'
* Finish task #61906.

See merge request easycorp/zentaopms!4653
2022-07-26 02:34:12 +00:00
王怡栋 cc159aab38 Merge branch 'sprint/master_zhouxudong_61907' into 'master'
Sprint/master zhouxudong 61907

See merge request easycorp/zentaopms!4652
2022-07-26 02:33:42 +00:00
zhouxudong 4bf59548a6 * Finish task #61908. 2022-07-26 02:28:43 +00:00
zhouxudong cf6845878f * Fix bug. 2022-07-26 02:21:28 +00:00
tianshujie 02b9139e86 * Finish task #61965. 2022-07-26 10:01:25 +08:00
王怡栋 4d28098976 Merge branch 'sprint/master_zhouxudong_61908' into 'master'
Sprint/master zhouxudong 61908

See merge request easycorp/zentaopms!4649
2022-07-26 01:54:30 +00:00
王怡栋 ffe955233c Merge branch 'sprint/master_zhoudong_61909' into 'master'
Sprint/master zhoudong 61909

See merge request easycorp/zentaopms!4644
2022-07-26 01:51:55 +00:00
zhouxudong 3cb2736d3b * Finish task #61909. 2022-07-26 01:39:05 +00:00
zhouxudong d0aabb1d4d * Finish task #61908. 2022-07-26 01:36:22 +00:00
tianshujie e73517cfc0 * Modify the style of the task view page return button. 2022-07-26 09:16:28 +08:00
caoyanyi 39120f1ca7 * Adjust codes. 2022-07-26 08:42:03 +08:00
tianshujie 21f33a3ee9 * Finish task #61967. 2022-07-25 15:35:47 +08:00
zhouxudong c23aa4ddb5 * Finish task #61906. 2022-07-25 07:16:34 +00:00
zhouxudong bc7382a1fb * Finish task #61908. 2022-07-25 06:31:22 +00:00
zhouxudong bda907b351 * Finish task #61907. 2022-07-25 05:43:59 +00:00
tianshujie 96c71eb326 * Finish task #61967. 2022-07-25 13:36:14 +08:00
zhouxudong 9dd747147f * Finish task #61909. 2022-07-25 05:10:38 +00:00
zhouxudong 272aaed0a9 * Finish task #61909. 2022-07-25 03:17:42 +00:00
tianshujie 0c9f532ee0 * Finish task #61970,61969,61968,61966. 2022-07-25 10:40:09 +08:00
caoyanyi 78e6133a0f * Adjust codes. 2022-07-25 10:37:59 +08:00
caoyanyi f8cd6fe1cb * Finish task #61811,61812. 2022-07-25 09:43:53 +08:00
王怡栋 bf8a1c82d5 Merge branch 'cyy_optimize' into 'master'
Cyy optimize

See merge request easycorp/zentaopms!4637
2022-07-22 08:02:13 +00:00
caoyanyi 9de38d0fe8 * Adjust code. 2022-07-22 15:59:40 +08:00
胡方舟 acc244f9ba Merge branch 'sprint/217_liumengyi_22507' into 'master'
* Fix bug #22507.

See merge request easycorp/zentaopms!4642
2022-07-22 07:51:48 +00:00
liumengyi 714787d108 * Fix bug #22507. 2022-07-22 15:50:37 +08:00
tianshujie 737799378d * Fix bug #24702. 2022-07-22 15:49:22 +08:00
caoyanyi 37bb83338a * Modify merge resule update. 2022-07-22 15:29:42 +08:00
胡方舟 88c5134f25 Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #24702.

See merge request easycorp/zentaopms!4640
2022-07-22 07:23:30 +00:00
胡方舟 6fcc801beb Merge branch 'sprint/217_liumengyi_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!4639
2022-07-22 07:21:27 +00:00
caoyanyi 0277ee77d0 * Add tips for projects under the server. 2022-07-22 15:20:18 +08:00
tianshujie f1998ad485 * Fix bug #24702. 2022-07-22 15:18:27 +08:00
caoyanyi b61a3ab9ef * Optimize page. 2022-07-22 13:51:11 +08:00
孙广明 f95c3ee86f Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4638
2022-07-22 05:42:16 +00:00
liumengyi 8d9aace2de * Fix bug. 2022-07-22 13:42:08 +08:00
caoyanyi 94a3dea3f7 * Optimize pages. 2022-07-22 13:35:54 +08:00
caoyanyi c14a618dec * Optimize page. 2022-07-22 13:35:30 +08:00
tianshujie 3db9286074 * Fix bug #25398. 2022-07-22 13:28:02 +08:00
tianshujie 6904928898 * Fix bug #25389. 2022-07-22 13:25:09 +08:00
王怡栋 780dc7399c Merge branch 'sprint/217_liumengyi_fixbug' into 'master'
* Fix bug #25554.

See merge request easycorp/zentaopms!4636
2022-07-22 05:22:16 +00:00
liumengyi d83ed1092d * Fix bug #25554. 2022-07-22 13:17:18 +08:00
孙广明 22230645dd * Fix bug #25627. 2022-07-22 13:07:49 +08:00
tianshujie 29a889ddcf * Fix bug #24702. 2022-07-22 12:03:23 +08:00
wangyidong c820d66059 * fix bug #25557. 2022-07-22 11:37:12 +08:00
liumengyi 374ec6f55d * Fix bug #25554. 2022-07-22 11:06:51 +08:00
liumengyi ba22c27e28 * Fix bug #24181. 2022-07-22 10:35:37 +08:00
tianshujie 5818db887f * Fix bug #25122. 2022-07-22 10:28:42 +08:00